diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java index e92280ce..02b262ac 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfSystemController.java @@ -267,7 +267,7 @@ public class AppEnfSystemController extends BaseController { @GetMapping("/dept") @ResponseBody public TableDataInfo dept(SysDeptBo dept, PageQuery pageQuery) { - TableDataInfodepts = DataPermissionHelper.ignore(() ->sysDeptService.selectPageDeptList(dept, pageQuery)); + TableDataInfodepts = DataPermissionHelper.ignore(() ->sysDeptService.selectPageDeptListWT(dept, pageQuery)); return depts; } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysDeptService.java index 9ca5bdb1..8f455341 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -25,7 +25,7 @@ public interface ISysDeptService { * @return 部门信息集合 */ TableDataInfo selectPageDeptList(SysDeptBo dept, PageQuery pageQuery); - + TableDataInfo selectPageDeptListWT(SysDeptBo dept, PageQuery pageQuery); /** * 查询部门管理数据 * diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index eef7f785..3dc6db45 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -66,10 +66,17 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { */ @Override public TableDataInfo selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) { + Page page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept)); return TableDataInfo.build(page); } + @Override + public TableDataInfo selectPageDeptListWT(SysDeptBo dept, PageQuery pageQuery) { + + Page page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapperWT(dept)); + return TableDataInfo.build(page); + } /** * 查询部门管理数据 * @@ -243,6 +250,19 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { return lqw; } + private LambdaQueryWrapper buildQueryWrapperWT(SysDeptBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysDept::getDelFlag, SystemConstants.NORMAL); + lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); + lqw.isNotNull(SysDept::getZone); + lqw.ne(SysDept::getZone, ""); + lqw.ne(SysDept::getZone, 2); + lqw.ne(SysDept::getDeptName, "街道"); + lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); + lqw.ne(SysDept::getDeptId, LoginHelper.getDeptId()); + return lqw; + } + /** * 构建前端所需要下拉树结构 *