Merge branch 'master' of http://124.220.229.80:9093/root/cif

cif-service/src/main/java/com/txz/cif/web/UserApiController.java

@@ -150,7 +150,9 @@ public class UserApiController extends AbstractApiController {
         }
         try {
             Condition condition = new Condition(User.class);
-            condition.createCriteria().andEqualTo("phoneNo", loginPara.getAccount());
+            condition.createCriteria()
+                    .andEqualTo("phoneNo", loginPara.getAccount())
+                    .orEqualTo("name", loginPara.getAccount());
             List<User> operators = userService.findByCondition(condition);
             User user = null;
             if (CollUtil.isEmpty(operators)) {
@@ -272,9 +274,9 @@ public class UserApiController extends AbstractApiController {
         if (StrUtil.isNotBlank(userForm.getPhoneNo())) {
             temp.setPhoneNo(userForm.getPhoneNo());
         }
-        if (StrUtil.isNotBlank(userForm.getName())) {
-            temp.setName(userForm.getName());
-        }
+        // if (StrUtil.isNotBlank(userForm.getName())) {
+        //     temp.setName(userForm.getName());
+        // }
         if (StrUtil.isNotBlank(userForm.getHeadPic())) {
             temp.setHeadPic(userForm.getHeadPic());
         }
@@ -307,7 +309,8 @@ public class UserApiController extends AbstractApiController {
             return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
         }
         Condition condition = new Condition(User.class);
-        condition.createCriteria().andEqualTo("phoneNo", params.getPhone());
+        condition.createCriteria().andEqualTo("phoneNo", params.getPhone())
+                    .orEqualTo("name", params.getName());;
         List<User> users = userService.findByCondition(condition);
         if (CollUtil.isNotEmpty(users)) {
             return ResultGenerator.genFailResult(ResultCode.USER_IS_EXIST);

cif-service/src/main/java/com/txz/cif/web/para/UserInfoForm.java

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.persistence.Column;
-
 @Getter
 @Setter
 @NoArgsConstructor
@@ -24,8 +22,8 @@ public class UserInfoForm {
     /**
      * 名字
      */
-    @ApiModelProperty(value="full name")
-    private String name;
+    // @ApiModelProperty(value="full name")
+    // private String name;
 
     @ApiModelProperty(value="user name")
     private String nickname;