bugfix:

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -681,4 +681,17 @@ public class CommonController extends BaseController {
     public Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum) {
         return commonService.checkFactoryNumUniquenessForVehicleCylinder(factoryNum,null);
     }
+
+    /**
+     * 根据父级code查询子设备分类
+     *
+     * @param parentCode 父级code
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getSubEquCategoryByParent")
+    @ApiOperation(httpMethod = "GET", value = "根据父级code查询子设备分类", notes = "根据父级code查询子设备分类")
+    public ResponseModel<List<EquipmentCategoryDto>> getSubEquCategoryByParent(@RequestParam(value = "parentCode") String parentCode) {
+        return ResponseHelper.buildResponse(commonService.getSubEquCategoryByParentCode(parentCode));
+    }
 }

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

@@ -241,4 +241,6 @@ public interface ICommonService {
     List<EquipmentCategoryDto> equipmentClassificationNoPipeline(String type);
 
     List<EquipmentCategoryDto> getEquDefineByParentId(String parentId);
+
+    List<EquipmentCategoryDto> getSubEquCategoryByParentCode(String parentCode);
 }

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

@@ -792,7 +792,7 @@ public class CommonServiceImpl implements ICommonService {
             result.forEach(x -> convertAndAddToUnitList(x, unitList));
         }
         // 使用单位追加 三环认领的（业主可能未注册系统，别人帮忙认领的，帮忙认领后会保存一份原使用单位的数据到字典）
-        if ("使用单位".equals(type)) {
+        if ("使用单位".equals(type) && "gasCylindersForCars".equals(business)) {
             List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues("OLD_USE_UNIT").getResult();
             result.forEach(x -> convertAndAddToUnitList(x, unitList));
         }
@@ -2122,6 +2122,11 @@ public class CommonServiceImpl implements ICommonService {
         return equipmentCategoryMapper.getEquDefineByParentId(parentId);
     }
 
+    @Override
+    public List<EquipmentCategoryDto> getSubEquCategoryByParentCode(String parentCode) {
+        return equipmentCategoryMapper.getSubEquCategoryByParentCode(parentCode);
+    }
+
     /**
      * 排序  ：页面列表排序功能支持，将 "字段,ascend" 或 "字段,descend" 转化为对应JSONObject
      *

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

@@ -100,5 +100,8 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
     @Select("SELECT * FROM tz_equipment_category WHERE parent_id = #{parentId}")
     List<EquipmentCategoryDto> getEquDefineByParentId(String parentId);
+
+    @Select("SELECT * FROM tz_equipment_category WHERE parent_id = ( SELECT ID FROM tz_equipment_category WHERE code = #{parentCode} )")
+    List<EquipmentCategoryDto> getSubEquCategoryByParentCode(String parentCode);
 }