Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -1174,11 +1174,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                             .filter(x -> "8300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
-            }
-            if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
-                return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
-                        .sorted(Comparator.comparing(DictionarieValueModel::getDictDataKey, Comparator.reverseOrder()))
-                        .collect(Collectors.toList());
+                if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
+                    return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
+                            .filter(x -> !"8300".equals(x.getDictDataKey()))
+                            .collect(Collectors.toList());
+                }
             }
             return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
         }

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

@@ -23,7 +23,7 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
     @Select("update idx_biz_jg_register_info set \"USE_ORG_CODE\" = #{useOrgCode} where \"RECORD\" = #{equipCode}")
     Boolean updateUseOrgCodeByEquip(@Param("equipCode") String equipCode,@Param("useOrgCode") String useOrgCode);
 
-    @Select("select code as dictDataKey,name as dictDataValue from tz_equipment_category where parent_id = ( SELECT sub.id from tz_equipment_category as sub where sub.code = #{equipCode})")
+    @Select("select code as dictDataKey,name as dictDataValue from tz_equipment_category where parent_id = ( SELECT sub.id from tz_equipment_category as sub where sub.code = #{equipCode}) order by dictDataKey desc")
     List<DictionarieValueModel> queryAllEquCategoriesUnderTheEquList(@Param("equipCode") String equipCode);
 
     @MapKey("uscUnitCreditCode")