From 0c85a2f0e5d067d946987823dbcd56e1f3f340b6 Mon Sep 17 00:00:00 2001
From: "gabry.wu" <gabrywu@apache.org>
Date: Thu, 4 Jun 2020 17:26:59 +0800
Subject: [PATCH] Merge pull request #2898 from 597365581/patch-6

merge method updateuser if and fix bug#2892
---
 .../dolphinscheduler/api/service/UsersService.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
index 815dcb099..8d79c8e47 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
@@ -306,13 +306,11 @@ public class UsersService extends BaseService {
             user.setEmail(email);
         }
 
-        if (StringUtils.isNotEmpty(phone)) {
-            if (!CheckUtils.checkPhone(phone)){
-                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
-                return result;
-            }
-            user.setPhone(phone);
+        if (StringUtils.isNotEmpty(phone) && !CheckUtils.checkPhone(phone)) {
+            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
+            return result;
         }
+        user.setPhone(phone);
         user.setQueue(queue);
         Date now = new Date();
         user.setUpdateTime(now);
-- 
GitLab