Merge remote-tracking branch 'origin/dingzhi' into dingzhi

# Conflicts:
#	web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalAssetsController.java

web-api/ruoyi-admin/src/main/java/com/ruoyi/api/PortalAssetsController.java

@@ -50,20 +50,15 @@ public class PortalAssetsController extends BaseController {
             if (currentUser != null && currentUser.getDeptId() != null) {
                 // 通过部门查询所有用户（在XML中通过IN子查询实现）
                 query.getParams().put("deptId", currentUser.getDeptId());
-                System.out.println("=== 查询部门作品，deptId=" + currentUser.getDeptId() + " ===");
             } else {
                 // 兜底只查个人
                 query.setUserId(currentUserId);
-                System.out.println("=== 部门ID为空，兜底查询个人作品 ===");
             }
         } else {
             // 默认只查询当前用户的数据
             query.setUserId(currentUserId);
-            System.out.println("=== 查询个人作品 userId=" + currentUserId + " ===");
         }
 
-        System.out.println("=== PortalAssetsController DEBUG START ===");
-        System.out.println("收到参数: is_top=" + is_top + ", beginTime=" + beginTime + ", endTime=" + endTime + ", dept=" + dept);
 
         // 收藏状态筛选 - is_top: Y=已收藏, N=未收藏
         if (is_top != null && !is_top.trim().isEmpty()) {
@@ -85,8 +80,6 @@ public class PortalAssetsController extends BaseController {
             System.out.println("✓ 设置 endTime = " + endTime);
         }
 
-        System.out.println("=== PortalAssetsController DEBUG END ===");
-
         startPage();
         List<AiOrder> list = aiOrderService.selectAiOrderList(query);
         System.out.println("PortalAssetsController - 查询返回 " + (list != null ? list.size() : 0) + " 条记录");