fix(ymt):批量更新电梯的96333码

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/EquipmentCategoryMapper.java

@@ -127,8 +127,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
             "\tAND ui.IS_INTO_MANAGEMENT = 1 \n" +
             "\tAND oi.SUPERVISORY_CODE IS NOT NULL \n" +
             "\tAND ( oi.code96333 IS NULL OR oi.code96333 = '' ) \n" +
-            "\tAND ( ui.city != '610100' OR ui.\"IS_NOT_XIXIAN\" = 1 )\n" +
-            "\tand oi.SUPERVISORY_CODE in ('A3100-0002769')\n")
+            "\tAND ( ui.city != '610100' OR ui.\"IS_NOT_XIXIAN\" = 1 )\n")
     List<Map<String, String>> selectExceptionCode96333();
 
     @Select("select *  from biz_jg_supervisory_code  where supervisory_code = #{supervisoryCode}  ORDER BY supervisory_code")

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

@@ -2700,12 +2700,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             String city = jsonObj.getString("city");
             String county = jsonObj.getString("county");
             String isNotXixian = jsonObj.getString("isNotXixian");
-            if (StringUtils.isEmpty(city) || "null".equals(city)) {
+            // 监管码
+            String supervisoryCode = jsonObj.getString("supervisoryCode");
+            if (StringUtils.isEmpty(city) || "null".equals(city) || StringUtils.isEmpty(supervisoryCode)) {
                 manualProcessData.add(jsonObj);
                 return;
             }
-            // 监管码
-            String supervisoryCode = jsonObj.getString("supervisoryCode");
             // record
             String record = jsonObj.getString("record");
             String code96333 = "";