diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java index 69f621ab..dda18494 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java @@ -163,7 +163,7 @@ public interface BizOrgService extends IService { * @author xuyuxiang * @date 2022/7/22 13:34 **/ - List orgListSelector(BizOrgSelectorOrgListParam bizOrgSelectorOrgListParam); + Page orgListSelector(BizOrgSelectorOrgListParam bizOrgSelectorOrgListParam); /** * 获取人员选择器 diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index a56c9709..128b14bd 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -343,14 +343,14 @@ public class BizOrgServiceImpl extends ServiceImpl impleme } @Override - public List orgListSelector(BizOrgSelectorOrgListParam bizOrgSelectorOrgListParam) { + public Page orgListSelector(BizOrgSelectorOrgListParam bizOrgSelectorOrgListParam) { QueryWrapper queryWrapper = new QueryWrapper().checkSqlInjection(); // 校验数据范围 List loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope(); if(ObjectUtil.isNotEmpty(loginUserDataScope)) { queryWrapper.lambda().in(BizOrg::getId, loginUserDataScope); } else { - return CollectionUtil.newArrayList(); + return new Page<>(); } // 查询部分字段 queryWrapper.lambda().select(BizOrg::getId, BizOrg::getParentId, BizOrg::getName, @@ -362,7 +362,7 @@ public class BizOrgServiceImpl extends ServiceImpl impleme queryWrapper.lambda().like(BizOrg::getName, bizOrgSelectorOrgListParam.getSearchKey()); } queryWrapper.lambda().orderByAsc(BizOrg::getSortCode); - return this.list(queryWrapper.lambda()); + return this.page(CommonPageRequest.defaultPage(), queryWrapper.lambda()); } @Override