校验注册代码、设备代码、96333码重复问题修改

.gitignore

@@ -6,3 +6,5 @@ target/
 /org.eclipse
 .settings
 log/
+*.gitignore
+**/.idea/**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -105,25 +105,25 @@
         <if test="equCode != null and equCode != ''">
             (SELECT COUNT ( 1 ) FROM idx_biz_jg_register_info ibjri
             LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi."RECORD" = ibjri."RECORD"
-            WHERE ibjri."EQU_CODE" = #{equCode}
+            WHERE ibjri."EQU_CODE" = #{equCode} and ibjoi."CLAIM_STATUS" = '已认领'
             <if test="type != 'save' ">
-               and ibjri."RECORD"  != #{record} and ibjoi."CLAIM_STATUS" = '已认领'
+               and ibjri."RECORD"  != #{record}
             </if>
             ) AS equCode,
         </if>
         <if test="useOrgCode != null and useOrgCode != ''">
             (SELECT COUNT ( 1 ) FROM idx_biz_jg_register_info ibjri
             LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjoi."RECORD" = ibjri."RECORD"
-            WHERE ibjri."USE_ORG_CODE" = #{useOrgCode}
+            WHERE ibjri."USE_ORG_CODE" = #{useOrgCode} and ibjoi."CLAIM_STATUS" = '已认领'
             <if test="type != 'save'">
-                and ibjri."RECORD"  != #{record} and ibjoi."CLAIM_STATUS" = '已认领'
+                and ibjri."RECORD"  != #{record}
             </if>
             ) AS useOrgCode,
         </if>
         <if test="code96333 != null and code96333 != ''">
-            (SELECT COUNT ( 1 ) FROM idx_biz_jg_other_info ibjoi WHERE ibjoi."CODE96333" = #{code96333}
+            (SELECT COUNT ( 1 ) FROM idx_biz_jg_other_info ibjoi WHERE ibjoi."CODE96333" = #{code96333} and ibjoi."CLAIM_STATUS" = '已认领'
             <if test="type != 'save'">
-                and ibjoi."RECORD"  != #{record} and ibjoi."CLAIM_STATUS" = '已认领'
+                and ibjoi."RECORD"  != #{record}
             </if>
             ) AS code
         </if>