From 4204fa248e63e0cc5fa453f005a5ec39b754bb16 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Sun, 15 Mar 2026 00:11:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BA=95=E5=BA=A7=E3=80=91=E5=AE=8C?= =?UTF-8?q?=E5=96=84SysOrgApi=E5=92=8CBizOrgApi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/vip/xiaonuo/biz/api/BizOrgApi.java | 4 ++-- .../src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java | 4 ++-- .../xiaonuo/biz/modular/org/provider/BizOrgApiProvider.java | 6 ++++-- .../dev/modular/config/controller/DevConfigController.java | 4 ++-- .../modular/config/param/DevConfigSelectorOrgTreeParam.java | 4 ++++ .../xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java | 6 ++++-- 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/snowy-plugin-api/snowy-plugin-biz-api/src/main/java/vip/xiaonuo/biz/api/BizOrgApi.java b/snowy-plugin-api/snowy-plugin-biz-api/src/main/java/vip/xiaonuo/biz/api/BizOrgApi.java index dbdfeb61..78076e15 100644 --- a/snowy-plugin-api/snowy-plugin-biz-api/src/main/java/vip/xiaonuo/biz/api/BizOrgApi.java +++ b/snowy-plugin-api/snowy-plugin-biz-api/src/main/java/vip/xiaonuo/biz/api/BizOrgApi.java @@ -32,7 +32,7 @@ public interface BizOrgApi { * @author yubaoshan * @date 2024/11/1 18:27:51 **/ - List orgTreeSelector(String parentId); + List orgTreeSelector(String parentId, String searchKey); /** * 获取组织列表选择器 @@ -40,5 +40,5 @@ public interface BizOrgApi { * @author yubaoshan * @date 2024/11/1 18:27:51 **/ - Page orgListSelector(String parentId); + Page orgListSelector(String parentId, String searchKey); } diff --git a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java index f827bf2d..1cfdcd70 100644 --- a/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java +++ b/snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java @@ -48,7 +48,7 @@ public interface SysOrgApi { * @author xuyuxiang * @date 2022/7/22 14:46 **/ - List orgTreeSelector(String parentId); + List orgTreeSelector(String parentId, String searchKey); /** * 获取组织列表选择器 @@ -56,7 +56,7 @@ public interface SysOrgApi { * @author xuyuxiang * @date 2022/7/22 14:45 **/ - Page orgListSelector(String parentId); + Page orgListSelector(String parentId, String searchKey); /** * 获取某组织的所有父级id集合 diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/provider/BizOrgApiProvider.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/provider/BizOrgApiProvider.java index 4b791b67..11aabb31 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/provider/BizOrgApiProvider.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/provider/BizOrgApiProvider.java @@ -38,17 +38,19 @@ public class BizOrgApiProvider implements BizOrgApi { private BizOrgService bizOrgService; @Override - public List orgTreeSelector(String parentId) { + public List orgTreeSelector(String parentId, String searchKey) { BizOrgSelectorTreeParam bizOrgSelectorTreeParam = new BizOrgSelectorTreeParam(); bizOrgSelectorTreeParam.setParentId(parentId); + bizOrgSelectorTreeParam.setSearchKey(searchKey); return bizOrgService.orgTreeSelector(bizOrgSelectorTreeParam); } @SuppressWarnings("ALL") @Override - public Page orgListSelector(String parentId) { + public Page orgListSelector(String parentId, String searchKey) { BizOrgSelectorOrgListParam bizOrgSelectorOrgListParam = new BizOrgSelectorOrgListParam(); bizOrgSelectorOrgListParam.setParentId(parentId); + bizOrgSelectorOrgListParam.setSearchKey(searchKey); return BeanUtil.toBean(bizOrgService.orgListSelector(bizOrgSelectorOrgListParam), Page.class); } } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/controller/DevConfigController.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/controller/DevConfigController.java index 85c48a99..a443abf9 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/controller/DevConfigController.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/controller/DevConfigController.java @@ -197,7 +197,7 @@ public class DevConfigController { @Operation(summary = "获取组织树选择器（懒加载）") @GetMapping("/dev/config/orgTreeSelector") public CommonResult> orgTreeSelector(DevConfigSelectorOrgTreeParam devConfigSelectorOrgTreeParam) { - return CommonResult.data(sysOrgApi.orgTreeSelector(devConfigSelectorOrgTreeParam.getParentId())); + return CommonResult.data(sysOrgApi.orgTreeSelector(devConfigSelectorOrgTreeParam.getParentId(), devConfigSelectorOrgTreeParam.getSearchKey())); } /** @@ -222,7 +222,7 @@ public class DevConfigController { @Operation(summary = "获取机构选择器") @GetMapping("/dev/config/orgSelector") public CommonResult> orgSelector(DevConfigSelectorOrgListParam devConfigSelectorOrgListParam) { - return CommonResult.data(sysOrgApi.orgListSelector(devConfigSelectorOrgListParam.getParentId())); + return CommonResult.data(sysOrgApi.orgListSelector(devConfigSelectorOrgListParam.getParentId(), devConfigSelectorOrgListParam.getSearchKey())); } /** diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/param/DevConfigSelectorOrgTreeParam.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/param/DevConfigSelectorOrgTreeParam.java index 6faa0e03..568c8e87 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/param/DevConfigSelectorOrgTreeParam.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/param/DevConfigSelectorOrgTreeParam.java @@ -29,4 +29,8 @@ public class DevConfigSelectorOrgTreeParam { /** 父id */ @Schema(description = "父id") private String parentId; + + /** 搜索关键字 */ + @Schema(description = "搜索关键字") + private String searchKey; } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java index dab4eb1b..44d79452 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java @@ -55,17 +55,19 @@ public class SysOrgApiProvider implements SysOrgApi { } @Override - public List orgTreeSelector(String parentId) { + public List orgTreeSelector(String parentId, String searchKey) { SysOrgSelectorTreeParam sysOrgSelectorTreeParam = new SysOrgSelectorTreeParam(); sysOrgSelectorTreeParam.setParentId(parentId); + sysOrgSelectorTreeParam.setSearchKey(searchKey); return sysOrgService.orgTreeSelector(sysOrgSelectorTreeParam); } @SuppressWarnings("ALL") @Override - public Page orgListSelector(String parentId) { + public Page orgListSelector(String parentId, String searchKey) { SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam = new SysOrgSelectorOrgListParam(); sysOrgSelectorOrgListParam.setParentId(parentId); + sysOrgSelectorOrgListParam.setSearchKey(searchKey); return BeanUtil.toBean(sysOrgService.orgListSelector(sysOrgSelectorOrgListParam), Page.class); }