From bee85de0c0bf51ef81b2c13f9f1bda2fd932d9b5 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Thu, 13 Aug 2026 16:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E5=A7=94=E6=89=98?=
 =?UTF-8?q?=E6=89=A7=E6=B3=95=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enforcement/AppEnfSystemController.java   |  2 +-
 .../system/service/ISysDeptService.java       |  2 +-
 .../service/impl/SysDeptServiceImpl.java      | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

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<SysDeptVo> dept(SysDeptBo dept, PageQuery pageQuery) {
-        TableDataInfo<SysDeptVo>depts = DataPermissionHelper.ignore(() ->sysDeptService.selectPageDeptList(dept, pageQuery));
+        TableDataInfo<SysDeptVo>depts = 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<SysDeptVo> selectPageDeptList(SysDeptBo dept, PageQuery pageQuery);
-
+    TableDataInfo<SysDeptVo> 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<SysDeptVo> selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) {
+
         Page<SysDeptVo> page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept));
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo<SysDeptVo> selectPageDeptListWT(SysDeptBo dept, PageQuery pageQuery) {
+
+        Page<SysDeptVo> 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<SysDept> buildQueryWrapperWT(SysDeptBo bo) {
+        LambdaQueryWrapper<SysDept> 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;
+    }
+
     /**
      * 构建前端所需要下拉树结构
      *