优化：设备分类接口查询，返回空数组不为空，但内部字段都为空的问题

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

@@ -27,13 +27,11 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -99,16 +97,20 @@ public class CommonServiceImpl implements ICommonService {
     public List<EquipmentCategory> getEquipmentCategoryList(String code, String type) {
         List<EquipmentCategory> result = new ArrayList<>();
 
-
         LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EquipmentCategory::getCode, code);
         EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectOne(wrapper);
         if (ObjectUtils.isEmpty(type)) {
+            if(!ValidationUtil.isEmpty(equipmentCategory)){
                 result.add(equipmentCategory);
+            }
         } else {
             LambdaQueryWrapper<EquipmentCategory> wrapper2 = new LambdaQueryWrapper<>();
             wrapper2.eq(EquipmentCategory::getParentId, equipmentCategory.getId());
-            result = equipmentCategoryMapper.selectList(wrapper2);
+            List<EquipmentCategory> equipmentCategories = equipmentCategoryMapper.selectList(wrapper2);
+            if(!ValidationUtil.isEmpty(equipmentCategories)){
+                result = equipmentCategories;
+            }
         }
         return result;
     }