fix(jg):代码回退

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

@@ -322,18 +322,23 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public List<EquipmentCategory> getEquipmentCategoryList(String code, String type) {
-        if (StringUtils.isEmpty(code)) {
-            return Collections.emptyList();
-        }
+        List<EquipmentCategory> result = new ArrayList<>();
         LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EquipmentCategory::getCode, code);
         EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectOne(wrapper);
-        if (equipmentCategory == null) {
-            return Collections.emptyList();
+        if (ObjectUtils.isEmpty(type)) {
+            if (!ValidationUtil.isEmpty(equipmentCategory)) {
+                result.add(equipmentCategory);
+            }
+        } else {
+            LambdaQueryWrapper<EquipmentCategory> wrapper2 = new LambdaQueryWrapper<>();
+            wrapper2.eq(EquipmentCategory::getParentId, equipmentCategory.getId());
+            List<EquipmentCategory> equipmentCategories = equipmentCategoryMapper.selectList(wrapper2);
+            if (!ValidationUtil.isEmpty(equipmentCategories)) {
+                result = equipmentCategories;
+            }
         }
-        LambdaQueryWrapper<EquipmentCategory> wrapper2 = new LambdaQueryWrapper<>();
-        wrapper2.eq(!StringUtils.isEmpty(type), EquipmentCategory::getParentId, equipmentCategory.getId());
-        return equipmentCategoryMapper.selectList(wrapper2);
+        return result;
     }
 
     @Override