From 2bb2f96857478289e99370dbc8201001a15596b7 Mon Sep 17 00:00:00 2001
From: luoqiz <luoqiangzheng@gmail.com>
Date: Wed, 6 Aug 2025 09:49:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20(#181)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../continew/admin/common/api/system/MenuApi.java  |  3 ++-
 .../admin/tenant/controller/PackageController.java |  5 +++--
 .../admin/tenant/model/query/TenantQuery.java      | 14 ++++++++++++++
 .../top/continew/admin/system/api/MenuApiImpl.java |  4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/continew-common/src/main/java/top/continew/admin/common/api/system/MenuApi.java b/continew-common/src/main/java/top/continew/admin/common/api/system/MenuApi.java
index e349f952..7d64a7d3 100644
--- a/continew-common/src/main/java/top/continew/admin/common/api/system/MenuApi.java
+++ b/continew-common/src/main/java/top/continew/admin/common/api/system/MenuApi.java
@@ -32,7 +32,8 @@ public interface MenuApi {
      * 查询树结构列表
      *
      * @param excludeMenuIds 排除的菜单 ID 列表
+     * @param isSimple       是否是简单树结构
      * @return 树结构列表
      */
-    List<Tree<Long>> listTree(List<Long> excludeMenuIds);
+    List<Tree<Long>> listTree(List<Long> excludeMenuIds, boolean isSimple);
 }
diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java
index 89fc4c05..2c506095 100644
--- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java
+++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/controller/PackageController.java
@@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import top.continew.admin.common.api.system.MenuApi;
 import top.continew.admin.common.base.controller.BaseController;
@@ -56,7 +57,7 @@ public class PackageController extends BaseController<PackageService, PackageRes
     @Operation(summary = "查询租户套餐菜单", description = "查询租户套餐菜单树列表")
     @SaCheckPermission("tenant:package:list")
     @GetMapping("/menu/tree")
-    public List<Tree<Long>> listMenuTree() {
-        return menuApi.listTree(tenantExtensionProperties.getIgnoreMenus());
+    public List<Tree<Long>> listMenuTree(@RequestParam(required = false, defaultValue = "true") Boolean isSimple) {
+        return menuApi.listTree(tenantExtensionProperties.getIgnoreMenus(), isSimple);
     }
 }
\ No newline at end of file
diff --git a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/model/query/TenantQuery.java b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/model/query/TenantQuery.java
index 0ed6ba86..5a5baaf8 100644
--- a/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/model/query/TenantQuery.java
+++ b/continew-plugin/continew-plugin-tenant/src/main/java/top/continew/admin/tenant/model/query/TenantQuery.java
@@ -45,6 +45,20 @@ public class TenantQuery implements Serializable {
     @Query(columns = {"name", "description"}, type = QueryType.LIKE)
     private String description;
 
+    /**
+     * 编码
+     */
+    @Schema(description = "编码", example = "T0stxiJK6RMH")
+    @Query(type = QueryType.EQ)
+    private String code;
+
+    /**
+     * 域名
+     */
+    @Schema(description = "域名", example = "admin.continew.top")
+    @Query(type = QueryType.LIKE)
+    private String domain;
+
     /**
      * 套餐 ID
      */
diff --git a/continew-system/src/main/java/top/continew/admin/system/api/MenuApiImpl.java b/continew-system/src/main/java/top/continew/admin/system/api/MenuApiImpl.java
index 9cb47b47..bf214848 100644
--- a/continew-system/src/main/java/top/continew/admin/system/api/MenuApiImpl.java
+++ b/continew-system/src/main/java/top/continew/admin/system/api/MenuApiImpl.java
@@ -39,11 +39,11 @@ public class MenuApiImpl implements MenuApi {
     private final MenuService baseService;
 
     @Override
-    public List<Tree<Long>> listTree(List<Long> excludeMenuIds) {
+    public List<Tree<Long>> listTree(List<Long> excludeMenuIds, boolean isSimple) {
         MenuQuery query = new MenuQuery();
         query.setStatus(DisEnableStatusEnum.ENABLE);
         // 过滤掉租户不能使用的菜单
         query.setExcludeMenuIdList(excludeMenuIds);
-        return baseService.tree(query, null, true);
+        return baseService.tree(query, null, isSimple);
     }
 }