执法端-修改反馈部门显示，用户重复

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;
+
 //    /**
 //     * 执法人员
 //     */

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EfcodeVirtualUnitMapper.xml

@@ -26,7 +26,7 @@
             </choose>
         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'
         <if test="!globalSearch and sysDeptId != null and sysDeptId != ''">
             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)

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
         <where>
             <!-- 执法部门过滤 -->