一码通checkCode方法优化

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>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -419,11 +419,11 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
     @Override
     public String checkCode(Map<String, Object> obj) {
         String result = null;
-        String type = (String) obj.get("type");
-        String code96333 = String.valueOf(obj.get("CODE96333"));
-        String equCode = (String) obj.get("EQU_CODE");
-        String useOrgCode = (String) obj.get("USE_ORG_CODE");
-        String record = (String) obj.get("id");
+        String type = ObjectUtils.isEmpty(obj.get("type")) ? null : String.valueOf(obj.get("type"));
+        String code96333 = ObjectUtils.isEmpty(obj.get("CODE96333")) ? null : String.valueOf(obj.get("CODE96333"));
+        String equCode = ObjectUtils.isEmpty(obj.get("EQU_CODE")) ? null : String.valueOf(obj.get("EQU_CODE"));
+        String useOrgCode = ObjectUtils.isEmpty(obj.get("USE_ORG_CODE")) ? null : String.valueOf(obj.get("USE_ORG_CODE"));
+        String record = ObjectUtils.isEmpty(obj.get("id")) ? null : String.valueOf(obj.get("id"));
         Map<String, Long> map = categoryOtherInfoMapper.checkCode(type, code96333, equCode, useOrgCode, record);
         if(map.containsKey("equCode") && map.get("equCode") > 0){
             result = "设备代码重复，请确认数据是否输入正确，或联系管辖机构处理。";