二期功能开发

common/src/main/java/com/jiagutech/ams/exception/BizCode.java

@@ -24,7 +24,6 @@ public enum BizCode implements CodeInterface {
     FILE_UPLOAD_ERROR(90002, "文件上传失败"),
 
 
-
     USER_NOT_FOUND(40004, "用户不存在"),
 
     CAPTCHA_ERROR(40003, "验证码错误"),
@@ -44,10 +43,9 @@ public enum BizCode implements CodeInterface {
     PERMISSION_NOT_FOUND(40001, "该用户无操作权限"),
 
     USER_PHONE_EXIST(40012, "用户手机号已存在"),
+    USER_IDENTITY_EXIST(40013, "身份证号已存在"),
 
-    NOT_ALLOWABLE(13001, "当前正在作业中无法创建新的作业，请先完成作业任务后再创建")
-
-    ;
+    NOT_ALLOWABLE(13001, "当前正在作业中无法创建新的作业，请先完成作业任务后再创建");
 
 
     private final Integer code;

system/src/main/java/com/jiagutech/ams/service/UserServiceImpl.java

@@ -241,8 +241,16 @@ public class UserServiceImpl implements UserService {
         UserDTO userDTO = new UserDTO();
         userDTO.setPhone(farmerAddRequest.getPhone());
         userDTO.setNickName(farmerAddRequest.getNickName());
-        userDTO.setIdentityCardNum(farmerAddRequest.getIdentityCardNum());
         userDTO.setRegionCode(farmerAddRequest.getRegionCode());
+        if (StringUtils.isNotBlank(farmerAddRequest.getIdentityCardNum())) {
+            QueryWrapper<UserDTO> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("identity_card_num", farmerAddRequest.getIdentityCardNum());
+            Long identityCount = userMapper.selectCount(queryWrapper);
+            if (identityCount > 0) {
+                throw new BusinessException(BizCode.USER_IDENTITY_EXIST);
+            }
+            userDTO.setIdentityCardNum(farmerAddRequest.getIdentityCardNum());
+        }
         if (userDTO.getRegionCode() != null && userDTO.getRegionCode() != 0L) {
             RegionVO completeRegionInfo = regionMapper.getCompleteRegionInfo(userDTO.getRegionCode());
             if (completeRegionInfo != null) {
@@ -250,8 +258,9 @@ public class UserServiceImpl implements UserService {
                 userDTO.setRegionName(completeRegionInfo.getRegionName());
             }
         }
-        userMapper.insert(userDTO);
+        userDTO.setPassword("");
+        int row = userMapper.insert(userDTO);
         insertUserRoleAndDept(userDTO, "farmer", 0L);
-        return false;
+        return row > 0;
     }
 }

system/src/main/resources/mapper/UserMapper.xml

@@ -40,6 +40,7 @@
         phone,
         create_time,
         avatar,
+        right(u.identity_card_num,4) as identity_card_num,
         u.region_code,
         r.region_name
         from ams_user u left join region_info r on u.region_code=r.region_code