停用机构不影响业务数据的统计,且不应在计划的下个周期生成任务

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -45,7 +45,7 @@ public interface RemoteOrgService {
     List<SysOrg> selectSysOrgByParentId(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
-     * 根据机构路径和类型查询
+     * 根据机构路径和类型查询 不包含停用机构
      *
      * @param path
      * @param type
@@ -54,6 +54,16 @@ public interface RemoteOrgService {
      */
     @GetMapping("/org/selectSysOrgByPathAndType")
     List<SysOrg> selectSysOrgByPathAndType(@RequestParam("path") String path, @RequestParam("type") Integer type, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    /**
+     * 根据机构路径和类型查询 包含停用机构
+     *
+     * @param path
+     * @param type
+     * @param source
+     * @return
+     */
+    @GetMapping("/org/selectOrgByPathAndType")
+    List<SysOrg> selectOrgByPathAndType(@RequestParam("path") String path, @RequestParam("type") Integer type, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 查询第一级机构

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -229,6 +230,11 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             public AjaxResult findDisableOrgAndClearData() {
                 return null;
             }
+
+            @Override
+            public List<SysOrg> selectOrgByPathAndType(String path, Integer type, String source) {
+                return Collections.emptyList();
+            }
         };
     }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -482,16 +482,21 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
     }
 
     private List<SysOrg> getExecOrgList(List<CoreDrillPlanToExecOrg> planExecOrgList, Integer execOrgType, String belongOrgPath) {
+        List<SysOrg> orgList = null;
         if (ObjectUtil.isEmpty(planExecOrgList)) {
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectByOrgPathAndOrgType(belongOrgPath, execOrgType, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         } else {
             List<Long> list = planExecOrgList.stream().map(CoreDrillPlanToExecOrg::getOrgId).collect(Collectors.toList());
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectOrgByIdList(list, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }
+        if (ObjectUtil.isEmpty(orgList)) {
+            return new ArrayList<>();
+        }
+        return orgList.stream().filter(org -> ObjectUtil.equal(0, org.getIsLock()) && ObjectUtil.equal(0, org.getDeleted())).collect(Collectors.toList());
     }
 
     private List<SysOrg> getExecOrgList(CoreDrillPlanDataVo plan, Date start, Date end) {
@@ -695,9 +700,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社")) {
-            sysOrgList = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgList = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgList = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgList = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             sysOrgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgTreeListByCurOrgId(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }
@@ -753,7 +758,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         result.forEach(r -> {
             if (r.getFinishRate().contains("%")) {
-                r.setFinishRate(r.getFinishRate().replace("%",""));
+                r.setFinishRate(r.getFinishRate().replace("%", ""));
             }
         });
         List<CoreDrillTaskReportVo> reportVoList = result.stream().sorted(Comparator.comparing(vo -> Double.valueOf(vo.getFinishRate()))).collect(Collectors.toList());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -512,16 +512,22 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     private List<SysOrg> getExecOrgList(List<CoreEduTrainingPlanToExecOrg> planExecOrgList, Integer execOrgType, String belongOrgPath) {
+        List<SysOrg> orgList = null;
         if (ObjectUtil.isEmpty(planExecOrgList)) {
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectByOrgPathAndOrgType(belongOrgPath, execOrgType, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         } else {
             List<Long> list = planExecOrgList.stream().map(CoreEduTrainingPlanToExecOrg::getOrgId).collect(Collectors.toList());
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectOrgByIdList(list, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }
+        if (ObjectUtil.isEmpty(orgList)) {
+            return new ArrayList<>();
+        }
+        return orgList.stream().filter(org -> ObjectUtil.equal(0, org.getIsLock()) && ObjectUtil.equal(0, org.getDeleted())).collect(Collectors.toList());
+
     }
 
 //    /**
@@ -713,9 +719,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社")) {
-            sysOrgList = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgList = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgList = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgList = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             sysOrgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgTreeListByCurOrgId(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -113,9 +113,9 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = remoteOrgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = remoteOrgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = remoteOrgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = remoteOrgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -63,9 +63,9 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }
@@ -391,9 +391,9 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }
@@ -522,7 +522,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
         if (null == sysOrg.getType()) {
             return Collections.emptyList();
         }
-        List<SysOrg> sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+        List<SysOrg> sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
 
         //如果查看省联社/地区 数据,那么就展示离行机构数量
         //如果查看行社数据,那么列表上展示离行机构名称
@@ -550,7 +550,7 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             });
         } else {
             for (SysOrg hsOrg : sysOrgs) {
-                List<SysOrg> lhOrgList = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(), SecurityConstants.INNER);
+                List<SysOrg> lhOrgList = orgService.selectOrgByPathAndType(sysOrg.getPath(), OrgTypeEnum.LIHANG_ZIZHU_YINGHANG.getCode(), SecurityConstants.INNER);
                 for (SysOrg lhOrg : lhOrgList) {
                     CompletableFuture<LhSelfBankInspectionReport> future = CompletableFuture.supplyAsync(() -> {
                         LhSelfBankInspectionReport intrusionTestReportVO = resumptionReportMapper.selectServiceBankReport(null, resumptionDTO, lhOrg.getPath());
@@ -606,9 +606,9 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -68,9 +68,9 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             return Collections.emptyList();
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }
@@ -196,9 +196,9 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             return Collections.EMPTY_LIST;
         }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
-            sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
+            sysOrgs = orgService.selectOrgByPathAndType(sysOrg.getPath(), 4, SecurityConstants.INNER);
         } else {
             return Collections.emptyList();
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskBuilderServiceImpl.java

@@ -119,22 +119,27 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
     }
 
     private List<SysOrg> getExecOrgList(List<Long> planExecOrgIds, Integer execOrgType, String belongOrgPath) {
+        List<SysOrg> orgList = null;
         if (ObjectUtil.isEmpty(planExecOrgIds)) {
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectByOrgPathAndOrgType(belongOrgPath, execOrgType, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         } else {
-            return RemoteCallHandlerExecutor.executeRemoteCall(() ->
+            orgList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
                             orgService.selectOrgByIdList(planExecOrgIds, SecurityConstants.INNER),
                     ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }
+        if (ObjectUtil.isEmpty(orgList)) {
+            return new ArrayList<>();
+        }
+        return orgList.stream().filter(org -> ObjectUtil.equal(0, org.getIsLock()) && ObjectUtil.equal(0, org.getDeleted())).collect(Collectors.toList());
     }
 
 
     @Override
     public void createAndSaveTask(List<TMonitoringRetrievalPlan> planList, LocalDate taskTime, List<Long> needBuildTaskOrgIdList) {
         List<CoreMonitoringRetrievalTask> allTask = createTask(planList, taskTime, needBuildTaskOrgIdList);
-        if (ObjectUtil.isNotEmpty(allTask)){
+        if (ObjectUtil.isNotEmpty(allTask)) {
             this.saveBatch(allTask);
         }
     }
@@ -568,9 +573,9 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                     .filter(t -> t.getOrgId().equals(sysOrg.getId()))
                     .filter(t -> t.getPlanId().equals(plan.getId()))
                     .findAny();
-            if (optional.isPresent()){
+            if (optional.isPresent()) {
                 //说明已经存在相同的任务了,
-               continue;
+                continue;
             }
             taskList.add(task);
 
@@ -629,7 +634,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         task.setYmdDay(ymd.getDay());
         task.setRoleId(plan.getRoleId());
         task.setStatus("0");
-       // task.setCreateTime(DateTime.now());
+        // task.setCreateTime(DateTime.now());
         task.setIsDeleted(0);
         return task;
     }

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -90,7 +90,7 @@
         core_drill_task t
         LEFT JOIN sys_user u ON t.host_id = u.id
         LEFT JOIN sys_org d ON t.org_id = d.id
-        where d.deleted=0 and d.is_lock=0
+        where d.deleted=0
             <choose>
                 <when test="request.checkSub==true">
                     and   t.org_path like concat(#{request.orgPath}, '%')
@@ -124,7 +124,7 @@
         round(ifnull(avg(t.comment_score),0),2) AS score
         from core_drill_task t inner join sys_org o on t.org_id = o.id
         <where>
-            and o.is_lock=0 and o.deleted=0
+                and o.deleted=0
             <if test="request.orgPath != null">
                 and o.path like concat(#{request.orgPath}, '%')
             </if>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -88,7 +88,7 @@
         core_edu_training_task t
         LEFT JOIN sys_user u ON t.host_id = u.id
         LEFT JOIN sys_org d ON t.org_id = d.id
-        where d.deleted=0 and d.is_lock=0
+        where d.deleted=0
             <choose>
                 <when test="request.checkSub==true">
                     and  t.org_path like concat(#{request.orgPath}, '%')
@@ -148,7 +148,7 @@
         ifnull(SUM(t.status = 2),0) AS finish
         from core_edu_training_task t inner join sys_org o on t.org_id = o.id
         <where>
-            and o.is_lock=0 and o.deleted=0
+                and o.deleted=0
             <if test="request.orgPath != null">
                 and o.path like concat(#{request.orgPath}, '%')
             </if>

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/MonitorAccessReportMapper.xml

@@ -31,7 +31,7 @@
         b.id
     </select>
     <select id="selectOrgNumByPathAndType" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=#{orgType} AND deleted=0 AND is_lock=0
+        SELECT COUNT(1) FROM sys_org WHERE path LIKE  concat( #{orgPath}, '%') AND type=#{orgType} AND deleted=0
     </select>
     <select id="selectAll" resultType="com.xunmei.core.reportForms.monitor.vo.MonitoringAccessVO">
         SELECT

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/ResumptionReportMapper.xml

@@ -82,7 +82,7 @@
                 exception_reform_count
             FROM
             core_resumption r
-            INNER JOIN sys_org o ON r.org_id = o.id AND o.deleted = 0 AND o.is_lock = 0
+            INNER JOIN sys_org o ON r.org_id = o.id AND o.deleted = 0
             LEFT JOIN core_resumption_plan b ON r.plan_id = b.id
         WHERE
             r.type = 2 and b.plan_exec in (2,3,4)
@@ -145,7 +145,7 @@
                     (SELECT COUNT(d.id) from core_question d WHERE r.id = d.src_task_id AND d.reform_status IN (11,13)) as exception_reform_count
                     FROM
                     core_resumption r
-                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0 AND o.is_lock =0
+                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0
                 INNER JOIN core_resumption_plan b ON r.plan_id = b.id
                 WHERE
                 b.plan_type =4
@@ -197,7 +197,7 @@
                 (SELECT COUNT(d.id) from core_question d WHERE r.id = d.src_task_id AND d.reform_status IN (11,13)) as exception_reform_count
             FROM
                 core_resumption r
-                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0 AND o.is_lock =0
+                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0
                 LEFT JOIN core_resumption_plan b ON r.plan_id = b.id
             WHERE
                 b.plan_type =5
@@ -257,7 +257,7 @@
                 (SELECT COUNT(d.id) from core_question d WHERE r.id = d.src_task_id AND d.reform_status IN (11,13)) as exception_reform_count
             FROM
                 core_resumption r
-                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0 AND o.is_lock =0
+                INNER JOIN sys_org o ON r.org_id=o.id AND o.deleted=0
                 INNER JOIN core_resumption_plan b ON r.plan_id = b.id
             WHERE
                 b.plan_type =6
@@ -295,7 +295,7 @@
         ) AS realityRectificationRate
         FROM
                 core_resumption a
-                INNER JOIN sys_org o ON a.org_id=o.id AND o.deleted=0 AND o.is_lock =0
+                INNER JOIN sys_org o ON a.org_id=o.id AND o.deleted=0
                 LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
                 LEFT JOIN core_question c ON c.src_task_id = a.id
         WHERE
@@ -340,7 +340,7 @@
         ) AS realityRectificationRate
         FROM
         core_resumption a
-        INNER JOIN sys_org o ON a.org_id=o.id AND o.deleted=0 AND o.is_lock =0
+        INNER JOIN sys_org o ON a.org_id=o.id AND o.deleted=0
         LEFT JOIN core_resumption_plan b ON a.plan_id = b.id
         LEFT JOIN core_question c ON c.src_task_id = a.id
         WHERE

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -259,7 +259,7 @@
         INNER JOIN core_safecheck_plan b ON a.plan_id = b.id
         INNER JOIN sys_org c ON a.org_id = c.id
         WHERE
-        a.deleted = 0 and c.is_lock=0 and c.deleted = 0
+        a.deleted = 0  and c.deleted = 0
           <if test="orgId !=null">
               and a.org_id =#{orgId}
           </if>
@@ -284,7 +284,7 @@
         INNER JOIN core_safecheck_plan b ON a.plan_id = b.id
         INNER JOIN sys_org c ON a.org_id = c.id
         WHERE
-        a.deleted = 0 and c.is_lock=0 and c.deleted = 0
+        a.deleted = 0  and c.deleted = 0
         AND a.`status` =3
           <if test="orgId !=null">
               and a.org_id=#{orgId}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -151,6 +151,13 @@ public class SysOrgController extends BaseController {
     public List<SysOrg> selectSysOrgByPathAndType(String path,Integer type) {
         return sysOrgService.selectSysOrgByPathAndType(path,type);
     }
+
+    @ApiOperation(value = "通过路径和机构类型查询,包含停用的")
+    @InnerAuth
+    @GetMapping("/selectOrgByPathAndType")
+    public List<SysOrg> selectOrgByPathAndType(String path,Integer type) {
+        return sysOrgService.selectOrgByPathAndType(path,type);
+    }
     /**
      * 通过父类查询子集合
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.vo.FindOrgTypes;
 import com.xunmei.system.api.vo.SysOrgVO;
 import com.xunmei.system.dto.SysOrgDto;
 import com.xunmei.system.dto.SysSelectOrgComponentDto;
@@ -181,6 +180,8 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
     List<SysOrg> selectSysOrgByPathAndType(@Param("path") String path, @Param("type") Integer type);
 
+    List<SysOrg> selectOrgByPathAndType(@Param("path") String path, @Param("type") Integer type);
+
     /**
      * @param orgPath
      * @param year

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

@@ -101,6 +101,9 @@ public interface ISysOrgService extends IService<SysOrg> {
 
     List<SysOrg> selectSysOrgByPathAndType(String path, Integer type);
 
+    List<SysOrg> selectOrgByPathAndType(String path, Integer type);
+
+
     List<ConstructionDetailExport> selectConstructionDetail(SysOrg dept);
 
     String selectPathById(Long orgId);

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

@@ -579,6 +579,11 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
+    public List<SysOrg> selectOrgByPathAndType(String path, Integer type) {
+        return sysOrgMapper.selectOrgByPathAndType(path, type);
+    }
+
+    @Override
     public List<ConstructionDetailExport> selectConstructionDetail(SysOrg dept) {
         String path = dept.getPath();
         if (StringUtils.isEmpty(path)) {
@@ -1127,7 +1132,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 result = sysOrgList.stream()
                         .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.DIQU_HANG_SHE.getCode()))
                         .filter(sysOrg -> sysOrg.getName().contains("地区行社"))
-                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
+                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getDeleted(), 0))
                         .sorted(Comparator.comparing(SysOrg::getSort))
                         .collect(Collectors.toList());
                 break;
@@ -1135,7 +1140,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 result = sysOrgList.stream()
                         .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                         .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()))
-                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
+                        .filter(sysOrg -> ObjectUtil.equal(sysOrg.getDeleted(), 0))
                         .sorted(Comparator.comparing(SysOrg::getSort))
                         .collect(Collectors.toList());
                 break;
@@ -1145,14 +1150,14 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                             .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                             .filter(sysOrg -> ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.HANG_SHE.getCode()))
                             .sorted(Comparator.comparing(SysOrg::getSort))
-                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getDeleted(), 0))
                             .collect(Collectors.toList());
                 } else {
                     result = sysOrgList.stream()
                             //.filter(sysOrg -> ObjectUtil.equal(sysOrg.getParentId(), org.getId()))
                             .filter(sysOrg -> sysOrg.getPath().startsWith(org.getPath()))
                             .sorted(Comparator.comparing(SysOrg::getSort))
-                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getIsLock(), 0) && ObjectUtil.equal(sysOrg.getDeleted(), 0))
+                            .filter(sysOrg -> ObjectUtil.equal(sysOrg.getDeleted(), 0))
                             .collect(Collectors.toList());
                 }
         }

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

@@ -1353,6 +1353,22 @@ and
         ORDER BY
         sort
     </select>
+    <select id="selectOrgByPathAndType" resultType="com.xunmei.system.api.domain.SysOrg">
+        SELECT
+        *
+        FROM
+        sys_org
+        WHERE
+        type = #{type}
+        AND deleted = 0
+        <if test="path != null">
+            AND path LIKE concat(#{path}, '%')
+        </if>
+
+        ORDER BY
+        sort
+    </select>
+
 
     <select id="selectOrgs" resultType="com.xunmei.system.dto.SysSelectOrgComponentDto">
         SELECT