解决 工作情况表导出 统计逻辑不一致的问题

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -103,7 +103,7 @@ public class SecurityWorkExport {
     private Integer innerPeople;
     @ExcelProperty(value = {"机构及人员配备", "监控中心人员情况", "其中，外聘员工人数"}, index = 41)
     private Integer outPeople;
-    @ExcelProperty(value = {"机构及人员配备", "监控中心安保卫持证人数"}, index = 42)
+    @ExcelProperty(value = {"机构及人员配备", "监控中心安全保卫持证人数"}, index = 42)
     private Integer certificatePeopleNumber;
     @ExcelProperty(value = {"机构及人员配备", "营业网点保安人员数", "人员合计"}, index = 43)
     private Integer certificateTotal;

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1098,9 +1098,9 @@ and
                         LEFT JOIN sys_user_information b ON a.id = b.user_id
                         LEFT JOIN sys_org c ON a.org_id = c.id
                 WHERE
-                    1 = 1
-                  AND b.dept_id = 2
+                  a.deleted = 0
                   AND b.certificate_work = '1'
+                  AND b.duties IN ( 2, 4, 5 )
                   AND a.is_manage = 'Y'
                   AND c.deleted = 0
                   and c.is_lock = 0
@@ -1215,6 +1215,7 @@ and
           AND a.is_full_time = #{isFull}
           AND a.duties in ('1','2','3')
           AND b.is_manage = 'Y'
+          AND b.deleted =0
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getManagerCertificate" resultType="java.lang.Integer">
@@ -1231,6 +1232,7 @@ and
           AND a.certificate_work = 1
           AND a.duties in ('1','2','3')
           AND b.is_manage = 'Y'
+          AND b.deleted =0
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getIsMonitor" resultType="java.lang.String">
@@ -1246,6 +1248,7 @@ and
           and c.deleted = 0
           and c.is_lock = 0
           AND b.is_manage = 'Y'
+          AND b.deleted =0
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getMonitorPeople" resultType="java.util.Map">