fix 用户资料修改

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -254,22 +254,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         validEntityBeforeUpdate(update);
         update.setUpdateTime(DateUtils.getNowTime());
         UserUpdateAddBo userUpdateAddBo = new UserUpdateAddBo();
-
+        UserVo oldUser = queryById(bo.getUserId());
         if (!StringUtils.isBlank(update.getRealname())){
             userUpdateAddBo.setUserId(bo.getUserId());
             userUpdateAddBo.setRealname(update.getRealname());
         }
         if (!StringUtils.isBlank(update.getTelphone())){
-            userUpdateAddBo.setUserId(bo.getUserId());
-            userUpdateAddBo.setTelphone(update.getTelphone());
+            //手机号变更
+            if(!oldUser.getTelphone().equals(update.getTelphone())){
+                User user = getOne(new LambdaQueryWrapper<User>()
+                        .eq(User::getTelphone,update.getTelphone()).ne(User::getUserId,update.getUserId()).last("limit 1"));
+                if(Validator.isNotNull(user)){
+                    throw new CustomException("该手机号已注册");
+                }
+                userUpdateAddBo.setUserId(bo.getUserId());
+                userUpdateAddBo.setTelphone(update.getTelphone());
+            }
+
         }
         if (!StringUtils.isBlank(update.getIdCard())){
-            Long list = iClassGradeUserService.selectList(update);
-           if (list > 0){
-               throw new IllegalAccessException("身份证已经被使用注册为学员");
-           }
-            userUpdateAddBo.setUserId(bo.getUserId());
-            userUpdateAddBo.setIdCard(update.getIdCard());
+            //手机号变更
+            if(!oldUser.getIdCard().equals(update.getIdCard())){
+                Long list = iClassGradeUserService.selectList(update);
+                if (list > 0){
+                    throw new IllegalAccessException("身份证已经被使用注册为学员");
+                }
+                userUpdateAddBo.setUserId(bo.getUserId());
+                userUpdateAddBo.setIdCard(update.getIdCard());
+            }
         }
         if (userUpdateAddBo != null) {
             userUpdateService.insertByAddBo(userUpdateAddBo);
@@ -678,7 +690,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     private Long findSubjectId(String subject){
-
         if(subject!=null){
             String key = "SUB_"+subject;
             Long value = redisCache.getCacheObject(key);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -41,8 +41,8 @@ public class UserEditBo {
     private String idCard;
 
     /** 手机号码 */
-  /*  @ApiModelProperty("手机号码")
-    private String telphone;*/
+    @ApiModelProperty("手机号码")
+    private String telphone;
 
     /** 用户等级 */
     @ApiModelProperty("用户等级")
@@ -70,12 +70,12 @@ public class UserEditBo {
 
 
     /** 身份证人像照 */
-  /*  @ApiModelProperty("身份证人像照")
-    private String idCardImg1;*/
+    @ApiModelProperty("身份证人像照")
+    private String idCardImg1;
 
     /** 身份证国徽照 */
-   /* @ApiModelProperty("身份证国徽照")
-    private String idCardImg2;*/
+    @ApiModelProperty("身份证国徽照")
+    private String idCardImg2;
 
     /** 国家 */
     @ApiModelProperty("国家")