证件重复校验未过滤已删除数据

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.annotations.DataAuth;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 
 import org.apache.ibatis.annotations.Param;
@@ -124,4 +125,12 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List<OrgUsr> selectPersonListByCompanyIdList(@Param("companyIdList") List<String> companyIdList);
 
     Map<String,String> getManagePerson(@Param("name")String name ,@Param("ids")List<Long> ids);
+
+    /**
+     * 检查身份证号码是否存在
+     * @param certificatesNumber
+     * @param orgUserId
+     * @return
+     */
+    List<DynamicFormInstance> checkCertificatesNumber(String certificatesNumber, Long orgUserId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1037,4 +1037,17 @@ LEFT JOIN (
                 #{item}
             </foreach>;
     </select>
+    <select id="checkCertificatesNumber" resultType="com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance">
+        SELECT
+            *
+        FROM
+            cb_dynamic_form_instance cdf
+            LEFT JOIN cb_org_usr cou ON cdf.instance_id = cou.sequence_nbr
+        WHERE
+            cdf.field_code = 'certificatesNumber' AND cdf.field_value = #{certificatesNumber}
+        <if test="orgUserId != null">
+            AND cdf.instance_id <![CDATA[<>]]> #{orgUserId}
+        </if>
+             AND cou.is_delete = 0
+    </select>
 </mapper>

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

@@ -3084,12 +3084,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		// 获取联系人
 		QueryWrapper<FirefightersContacts> queryWrapper1 = new QueryWrapper<>();
-		queryWrapper1.eq("org_usr_id", id);
+		queryWrapper1.eq("org_usr_id", String.valueOf(id));
 		FirefightersContacts firefightersContacts = ifirefightersContactsService.getOne(queryWrapper1);
-
 		// 获取岗位标签
 		QueryWrapper queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("org_usr_id", id);
+		queryWrapper.eq("org_usr_id", String.valueOf(id));
 		FirefightersDataDto firefightersDataDto = new FirefightersDataDto(
 				ifirefightersWorkexperienceService.getOne(queryWrapper),
 				ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
@@ -3221,11 +3220,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	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);
+		List<DynamicFormInstance> list = orgUsrMapper.checkCertificatesNumber(certificatesNumber, orgUserId);
 		return !list.isEmpty();
 	}