报表导出修改

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -351,7 +351,12 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
             //独立机构
             Integer alone = baseMapper.getAlone(s.getPath());
-            securityWorkExport.setIsAlone(alone);
+            if(alone > 0){
+                securityWorkExport.setIsAlone("是");
+            }else{
+                securityWorkExport.setIsAlone("否");
+            }
+
 
             //部门负责人
             Integer y = baseMapper.getManager(s.getPath(), "Y");

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

@@ -82,7 +82,7 @@ public class SecurityWorkExport {
     @ExcelProperty(value = {"营业网点夜间值守", "异地值守网点数量（由监控中心进行远程值守）"}, index = 30)
     private Integer remoteDutyNetworkNumber;
     @ExcelProperty(value = {"机构及人员配备", "是否设立独立机构数"}, index = 31)
-    private Integer isAlone;
+    private String isAlone;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为专职人数"}, index = 32)
     private Integer managerFullTime;
     @ExcelProperty(value = {"机构及人员配备", "部门负责人、一般管理人员和监控中心负责人为兼职职人数"}, index = 33)

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

@@ -1101,7 +1101,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             sys_user_information a
                 LEFT JOIN sys_user b ON a.user_id = b.id
                 LEFT JOIN sys_org c ON b.org_id = c.id
-        WHERE c.deleted = 0 and  a.alone_dept='Y' AND c.path LIKE concat(#{orgPath}, '%')
+        WHERE c.deleted = 0 and  a.alone_dept='Y' and b.is_manage = 'Y' AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getManager" resultType="java.lang.Integer">
         SELECT
@@ -1115,6 +1115,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
           AND c.deleted = 0
           AND a.is_full_time = #{isFull}
           AND a.duties in ('1','2','3')
+          AND b.is_manage = 'Y'
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getManagerCertificate" resultType="java.lang.Integer">
@@ -1129,6 +1130,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
           AND c.deleted = 0
           AND a.certificate_work = 1
           AND a.duties in ('1','2','3')
+          AND b.is_manage = 'Y'
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getIsMonitor" resultType="java.lang.String">
@@ -1142,6 +1144,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
         WHERE
             a.duties = #{duties}
           and c.deleted = 0
+          AND b.is_manage = 'Y'
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getMonitorPeople" resultType="java.util.Map">
@@ -1156,6 +1159,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
         WHERE
             a.duties IN ( 2, 4, 5 )
           AND c.deleted = 0
+          AND b.is_manage = 'Y'
           AND c.path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getSafeHeadToNetwork" resultType="java.lang.Integer">