Merge branches 'dev_ic_data' and 'dev_ic_v2' of http://121.42.41.42:7070/r/epmet-cloud into dev_ic_data

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EditInfoFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -38,7 +39,7 @@ public class EditInfoFormDTO implements Serializable {
 	private String name;
 
 	//@NotBlank(message = "身份证号不能为空")
-	//@Length(max=18,message = "身份证号不能超过18位")
+	@Length(max=18,message = "身份证号不能超过18位")
 	//别的小程序不统一升级，没办法限制必填。
 	private String idNum;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -85,4 +85,8 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
     UserBaseInfoDTO selectUserId(@Param("customerId") String customerId,
                                  @Param("idNum")String idNum,
                                  @Param("userId")String userId);
+
+    Integer selectCountIdNum(@Param("idNum") String idNum,
+                             @Param("customerId")String customerId,
+                             @Param("excludeUserId")String excludeUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java

@@ -191,4 +191,6 @@ public interface UserBaseInfoService extends BaseService<UserBaseInfoEntity> {
     ExtUserInfoResultDTO extUserInfo(CommonUserIdFormDTO param);
 
     UserBaseInfoDTO getUserIdByIdNum(String customerId, String idNum,String userId);
+
+    Integer checkIdNum(String idNum, String customerId, String excludeUserId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -450,4 +450,9 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }
         return baseDao.selectUserId(customerId,idNum,userId);
     }
+
+    @Override
+    public Integer checkIdNum(String idNum, String customerId, String excludeUserId) {
+        return baseDao.selectCountIdNum(idNum,customerId,excludeUserId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -223,6 +223,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(),null) > NumConstant.ZERO) {
 				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
 			}
+			//判断user_base_info表是否存在相同的身份证号
+			if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) {
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用");
+			}
 		}
 		userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
 		//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
@@ -307,8 +311,14 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
 			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(), EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
 		}
-		if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(),userResiInfoDTO.getUserId()) > 0) {
-			throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
+		if(StringUtils.isNotBlank(userResiInfoDTO.getIdNum())){
+			if (baseDao.selectCountByIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(),userResiInfoDTO.getUserId()) > 0) {
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
+			}
+			//判断user_base_info表是否存在相同的身份证号
+			if (userBaseInfoService.checkIdNum(userResiInfoDTO.getIdNum(), userResiInfoDTO.getCustomerId(), null) > 0) {
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用");
+			}
 		}
 		//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
 		registerRelationService.saveRegisterRelation(userResiInfoDTO);
@@ -385,10 +395,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	@Override
 	public void editUserInfo(EditInfoFormDTO formDTO) {
 		if(StringUtils.isNotBlank(formDTO.getIdNum())){
+			if(formDTO.getIdNum().length()>18){
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号至多18位");
+			}
 			//判断身份证号唯一，除了当前用户外没有人用过这个身份证号吧？？？
 			if(baseDao.selectCountByIdNum(formDTO.getIdNum(),formDTO.getCustomerId(),formDTO.getUserId())>0){
 				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_resi_info已存在该身份证号", "身份证号已被使用");
 			}
+			//判断user_base_info表是否存在相同的身份证号
+			if (userBaseInfoService.checkIdNum(formDTO.getIdNum(), formDTO.getCustomerId(), formDTO.getUserId()) > 0) {
+				throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "user_base_info已存在该身份证号", "身份证号已被使用");
+			}
 		}
 		//更新居民注册信息表
 		baseDao.updateByUserId(ConvertUtils.sourceToTarget(formDTO, UserResiInfoEntity.class));

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -134,4 +134,18 @@
             and user_id=#{userId}
         </if>
     </select>
+
+    <select id="selectCountIdNum" parameterType="map" resultType="java.lang.Integer">
+        SELECT
+            count(ubi.id)
+        FROM
+            user_base_info ubi
+        WHERE
+            ubi.DEL_FLAG = '0'
+            AND ubi.id_num = #{idNum}
+            and ubi.customer_id=#{customerId}
+            <if test="excludeUserId != null and excludeUserId != ''">
+                AND ubi.user_id != #{excludeUserId}
+            </if>
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -43,7 +43,8 @@
             NAME = #{name},
             STREET = #{street},
             DISTRICT = #{district},
-            BUILDING_ADDRESS = #{buildingAddress}
+            BUILDING_ADDRESS = #{buildingAddress},
+            ID_NUM = #{idNum}
         where USER_ID = #{userId}
         and DEL_FLAG = '0'
     </update>