From ddc0dda586c8b43a62baef928d674bf98c24cede Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Sat, 29 Mar 2025 14:37:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=8E=B7=E5=8F=96=E4=B8=93=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/home/ColumnTreeController.java | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java
index dec1f2b..4855117 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/ColumnTreeController.java
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * ClassName: ColumnController
@@ -98,18 +99,25 @@ public class ColumnTreeController extends BaseController {
     @GetMapping("/getSpecial")
     public R<PageInfo<SysSpecialVo>>  getSpecial(@RequestParam(required = false) String id,
                                             @RequestParam(required = false) String columnId) {
-        List<SysSpecialVo>  sysSpecialVos = new ArrayList<>();
-        LambdaQueryWrapper<SysColumn> queryWrapper= new LambdaQueryWrapper<>();
+        List<SysSpecialVo> sysSpecialVos = new ArrayList<>();
+        LambdaQueryWrapper<SysColumn> columnQueryWrapper = new LambdaQueryWrapper<>();
+        columnQueryWrapper.eq(SysColumn::getStatus, STATUS);
         if(StringUtils.isNotEmpty(columnId)){
-            queryWrapper.eq(SysColumn::getColumnId, columnId);
+            columnQueryWrapper.eq(SysColumn::getColumnId, columnId);
         }else{
-            queryWrapper.eq(SysColumn::getParentId, id);
+            columnQueryWrapper.eq(SysColumn::getParentId, id);
         }
-        queryWrapper.eq(SysColumn::getStatus,STATUS);
-        queryWrapper.orderByAsc(SysColumn::getOrderNum);
-        List<SysColumn>  specialColumns = columnService.list(queryWrapper);
-        specialColumns.forEach(column->{
-            SysSpecialVo  sysSpecialVo = new SysSpecialVo();
+        columnQueryWrapper.orderByAsc(SysColumn::getOrderNum);
+        List<SysColumn> columns = columnService.list(columnQueryWrapper);
+        if (columns.isEmpty() && StringUtils.isEmpty(columnId)) {
+            columnQueryWrapper.clear();
+            columnQueryWrapper.eq(SysColumn::getColumnId, id)
+                    .eq(SysColumn::getStatus, STATUS)
+                    .orderByAsc(SysColumn::getOrderNum);
+            columns = columnService.list(columnQueryWrapper);
+        }
+        columns.forEach(column -> {
+            SysSpecialVo sysSpecialVo = new SysSpecialVo();
             sysSpecialVo.setColumnId(column.getColumnId());
             sysSpecialVo.setColumnName(column.getColumnName());
             SysSpecial sysSpecial = new SysSpecial();