Merge pull request #2898 from 597365581/patch-6

merge method updateuser if and fix bug#2892

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 (StringUtils.isNotEmpty(phone) && !CheckUtils.checkPhone(phone)) {
-            if (!CheckUtils.checkPhone(phone)){
+            putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
-                putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR,phone);
+            return result;
-                return result;
-            }
-            user.setPhone(phone);
         }
+        user.setPhone(phone);
         user.setQueue(queue);
         Date now = new Date();
         user.setUpdateTime(now);