安保从业人员表导出未排除已禁用人员；工作情况表（本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数））包含临时登记

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

@@ -1126,7 +1126,9 @@ and
             a.deleted = 0
           AND b.deleted = 0
           and b.is_lock = 0
-          AND c.check_type =3
+<!--          AND c.check_type =3-->
+          AND b.type=4
+          AND a.org_id = a.check_org_id
           AND a.`status` =3
           and a.org_path LIKE concat(#{orgPath}, '%')
           AND a.start_time BETWEEN #{startTime} and #{endTime}

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

@@ -758,6 +758,7 @@
                  LEFT JOIN sys_org c ON c.id = b.org_id
         WHERE b.deleted = 0
           AND b.is_manage='Y'
+          AND b.is_lock=0
           and c.path like concat(#{path}, '%')
         ORDER BY
             FIND_IN_SET( c.affiliated_bank, #{findInSetOrder} ),