考核指标分类表

airport-admin/src/main/java/com/sundot/airport/web/controller/system/BasePerformanceIndicatorCategoryController.java

@@ -104,7 +104,7 @@ public class BasePerformanceIndicatorCategoryController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:performanceIndicatorCategory:list')")
     @GetMapping("/listTree")
     public AjaxResult listTree(BasePerformanceIndicatorCategory basePerformanceIndicatorCategory) {
-        List<BasePerformanceIndicatorCategory> list = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryList(basePerformanceIndicatorCategory);
+        List<BasePerformanceIndicatorCategory> list = basePerformanceIndicatorCategoryService.selectBasePerformanceIndicatorCategoryListTree(basePerformanceIndicatorCategory);
         return success(list);
     }
 

airport-system/src/main/java/com/sundot/airport/system/service/impl/BasePerformanceIndicatorCategoryServiceImpl.java

@@ -277,13 +277,41 @@ public class BasePerformanceIndicatorCategoryServiceImpl implements IBasePerform
     private List<BasePerformanceIndicatorCategoryTreeDTO> filterTree(List<BasePerformanceIndicatorCategoryTreeDTO> nodeList, BasePerformanceIndicatorCategoryTreeRequestDTO requestDTO) {
         List<BasePerformanceIndicatorCategoryTreeDTO> result = new ArrayList<>();
         for (BasePerformanceIndicatorCategoryTreeDTO node : nodeList) {
-            boolean selfMatch = matchesCategory(node, requestDTO);
+            // 判断是否为一级分类（parentId = 0 或 null）
+            boolean isRoot = node.getParentId() == null || node.getParentId() == 0;
+
+            // 递归过滤子节点
             List<BasePerformanceIndicatorCategoryTreeDTO> filteredChildren = filterTree(node.getChildren(), requestDTO);
 
-            // 保留条件：自身匹配 或 子节点有匹配
-            if (selfMatch || !filteredChildren.isEmpty()) {
-                node.setChildren(filteredChildren);
-                result.add(node);
+            if (isRoot) {
+                // 一级分类：只有当它有有效的二级子节点时才保留
+                if (!filteredChildren.isEmpty()) {
+                    node.setChildren(filteredChildren);
+                    result.add(node);
+                }
+                // 如果没有有效的二级子节点，直接丢弃一级分类
+            } else {
+                // 二级分类：必须满足以下条件之一才能保留：
+                // 1. 自身匹配（分类名称/编码）
+                // 2. 有指标数据（indicatorList不为空）
+                boolean selfMatch = matchesCategory(node, requestDTO);
+                boolean hasIndicators = node.getIndicatorList() != null && !node.getIndicatorList().isEmpty();
+
+                // 如果查询条件为空，则只要有指标就显示
+                // 如果查询条件不为空，则需要满足查询条件或有指标
+                boolean shouldKeep = false;
+                if (StrUtil.isBlank(requestDTO.getCategoryCode()) && StrUtil.isBlank(requestDTO.getCategoryName())) {
+                    // 没有分类查询条件时，只要有指标就保留
+                    shouldKeep = hasIndicators;
+                } else {
+                    // 有分类查询条件时，需要自身匹配或有指标
+                    shouldKeep = selfMatch || hasIndicators;
+                }
+
+                if (shouldKeep) {
+                    node.setChildren(filteredChildren);
+                    result.add(node);
+                }
             }
         }
         return result;