From c03275e240a67e5efae4e14014f4efd8ae2e01cd Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 12 Aug 2026 18:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/enterprise/EnforcementRegistrationListVo.java | 9 +++++++++ .../mapper/enforcementcode/EfcodeVirtualUnitMapper.xml | 2 +- .../enforcementcode/EnforcementRegistrationMapper.xml | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java index 5df47eb9..20611e7a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java @@ -132,6 +132,15 @@ public class EnforcementRegistrationListVo implements Serializable { */ private Date evaluateTime; + /** + * 执法部门ID + */ + private String bureauDeptId; + /** + * 执法部门名称 + */ + private String bureauDeptName; + // /** // * 执法人员 // */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml index 51bc46b6..fcc91a39 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml @@ -26,7 +26,7 @@ FROM sys_user u LEFT JOIN sys_dept d ON u.dept_id = d.dept_id - WHERE u.del_flag = '0' and d.dept_id != 405 and u.user_name != 'admin' + WHERE u.del_flag = '0' and d.dept_id != 405 and u.user_name != 'admin' and u.isDeleted !='true' AND (u.dept_id = #{sysDeptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE t.del_flag = '0' AND FIND_IN_SET(#{sysDeptId}, t.ancestors) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index 861ed9ed..806c7404 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -140,7 +140,9 @@ law_enforcement_basis, has_evaluate, is_real_union, - law_enforcement_item_text + law_enforcement_item_text, + bureau_dept_id , + bureau_dept_name FROM enforcement_registration