refactor(设备分类): 优化设备分类查询逻辑

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

@@ -2404,13 +2404,13 @@ public class CommonServiceImpl implements ICommonService {
         List<EquipmentCategoryDto> result = Collections.emptyList();
         switch (type) {
             case "1":
-                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0]*000$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                result = categoryList.stream().filter(category -> category.getDescription().equals("EQU_LIST")).collect(Collectors.toList());
                 break;
             case "2":
-                result = categoryList.stream().filter(category -> Pattern.compile("^[^\0]*00$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                result = categoryList.stream().filter(category -> category.getDescription().equals("EQU_CATEGORY")).collect(Collectors.toList());
                 break;
             case "3":
-                result = categoryList.stream().filter(category -> Pattern.compile("^[^\\D0A-Za-z]*[A-Za-z0-9]*[^0]0$").matcher(category.getCode()).matches()).collect(Collectors.toList());
+                result = categoryList.stream().filter(category -> category.getDescription().equals("EQU_DEFINE")).collect(Collectors.toList());
                 break;
         }
         return result;

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

@@ -721,7 +721,7 @@
     <select id="selectClassifyNoStart7And8ByParentCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto">
         select * from tz_equipment_category
          <where>
-             code NOT LIKE '7%' AND code NOT LIKE '8%'
+             is_delete = 0
              <if test="parentCode != null and parentCode != ''">
                  and parent_id = (SELECT id FROM tz_equipment_category WHERE code = #{parentCode} )
              </if>