1.人员证件号码验证bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -347,9 +347,10 @@ public interface IOrgUsrService {
     /**
      * 查询身份证号码是否重复
      * @param certificatesNumber 身份证号码
+     * @param orgUserId
      * @return 标识
      */
-    boolean checkCertificatesNumber(String certificatesNumber);
+    boolean checkCertificatesNumber(String certificatesNumber, Long orgUserId);
 
     /**
      * 根据id删除消防人员

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgPersonController.java

@@ -378,8 +378,9 @@ public class OrgPersonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/people/checkCertificates/{certificatesNumber}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "查询身份证号码是否重复", notes = "查询身份证号码是否重复")
-    public ResponseModel<Boolean> checkCertificatesNumber(@PathVariable String certificatesNumber) {
-        return ResponseHelper.buildResponse(iOrgUsrService.checkCertificatesNumber(certificatesNumber));
+    public ResponseModel<Boolean> checkCertificatesNumber(@PathVariable String certificatesNumber,
+                                                          @RequestParam(required = false) Long orgUserId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.checkCertificatesNumber(certificatesNumber, orgUserId));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -18,10 +17,8 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.mapper.*;
-import com.yeejoin.amos.boot.module.common.api.service.IFireCompanyInfoService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -3133,12 +3130,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
-	public boolean checkCertificatesNumber(String certificatesNumber) {
-		QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("field_code", "certificatesNumber");
-		queryWrapper.eq("field_value", certificatesNumber);
+	public boolean checkCertificatesNumber(String certificatesNumber, Long orgUserId) {
+		LambdaQueryWrapper<DynamicFormInstance> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(DynamicFormInstance::getFieldCode, "certificatesNumber");
+		queryWrapper.eq(DynamicFormInstance::getFieldValue, certificatesNumber);
+		queryWrapper.ne(orgUserId !=null, DynamicFormInstance::getInstanceId, orgUserId);
 		List<DynamicFormInstance> list = dynamicFormInstanceService.list(queryWrapper);
-		return !ObjectUtils.isEmpty(list) && list.size() > 1;
+		return !list.isEmpty();
 	}
 
 	@Override

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -780,7 +780,7 @@ public class ExcelServiceImpl {
 					if (!set.add(orgUsrExcelDto.getCertificatesNumber())) {
 						throw new RuntimeException("身份证号码重复!");
 					} else {
-						boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber());
+						boolean b = orgUsrService.checkCertificatesNumber(orgUsrExcelDto.getCertificatesNumber(), null);
 						if (b) {
 							throw new RuntimeException("身份证号码重复!");
 						}
@@ -1385,7 +1385,7 @@ public class ExcelServiceImpl {
 		fireExpertsServiceImpl.saveBatch(excelEntityList);
 	}
     @Async
-	private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) throws Exception {
+	private void excelImportDutyPerson(MultipartFile multipartFile, String dutyType,String uuidString) {
 		try {
 			ImportDutyPerson(multipartFile,dutyType);
 			if(redisUtils.hasKey(uuidString)){