5种计划的列表实现“不能看见其它其它机构创建且状态为草稿”的任务

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/TMonitoringRetrievalPlanMapper.java

@@ -30,7 +30,7 @@ public interface TMonitoringRetrievalPlanMapper extends BaseMapper<TMonitoringRe
      */
     TMonitoringRetrievalPlan selectTMonitoringRetrievalPlanById(Long id);
 
-    Page<TMonitoringRetrievalPlanVO> selectPageList(@Param("page") Page<TMonitoringRetrievalPlanVO> page, @Param("request") TMonitoringRetrievalPlan request);
+    Page<TMonitoringRetrievalPlanVO> selectPageList(@Param("page") Page<TMonitoringRetrievalPlanVO> page, @Param("request") TMonitoringRetrievalPlan request, @Param("userOrgId") Long userOrgId);
 
     /**
      * 查询监控调阅计划列表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -129,7 +129,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         query.orderByDesc("create_time");
         //获取数据
 
-        page = tMonitoringRetrievalPlanMapper.selectPageList(page, tMonitoringRetrievalPlan);
+        page = tMonitoringRetrievalPlanMapper.selectPageList(page, tMonitoringRetrievalPlan, SecurityUtils.getLoginUser().getOrgId());
         page.getRecords().forEach(p -> {
             boolean isComplete = this.getIsComplete(p.getId());
             p.setIsComplete(isComplete);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillPlanMapper.java

@@ -66,7 +66,7 @@ public interface CoreDrillPlanMapper extends BaseMapper<CoreDrillPlan> {
      */
     int deleteCoreDrillPlanByIds(Long[] ids);
 
-    Page<CoreDrillPlanPageVo> selectPageData(Page<CoreDrillPlanPageVo> pageRequest, @Param("request") CoreDrillPlanPageDto request);
+    Page<CoreDrillPlanPageVo> selectPageData(Page<CoreDrillPlanPageVo> pageRequest, @Param("request") CoreDrillPlanPageDto request, @Param("userOrgId") Long userOrgId);
 
     List<CoreDrillPlanPageVo> selectChildrenPlan(@Param("request") CoreDrillPlanPageDto request);
 

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

@@ -105,6 +105,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     private RemoteOrgService orgService;
     @Autowired
     private ICoreRegisterBookPdfService registerBookPdfService;
+
     @Override
     public TableDataInfo<CoreDrillPlanPageVo> selectPage(CoreDrillPlanPageDto request) {
         //下穿
@@ -114,7 +115,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         }
         SysOrg topOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
 
-        Page<CoreDrillPlanPageVo> page = coreDrillPlanMapper.selectPageData(request.getPageRequest(), request);
+        Page<CoreDrillPlanPageVo> page = coreDrillPlanMapper.selectPageData(request.getPageRequest(), request, SecurityUtils.getLoginUser().getOrgId());
         for (CoreDrillPlanPageVo record : page.getRecords()) {
             dealData(record, page.getRecords(), topOrg.getId(), request);
         }
@@ -658,12 +659,12 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         } else {
             //计划下有已完成：删除本轮次及以后的所有任务，计划本身做逻辑删除。
             final CoreDrillPlan plan = getById(id);
-            Date date=null;
+            Date date = null;
             if (plan.getPlanCycle().equals(DrillPlanCycleEnum.NONE.getCode())) {
-                date=DateUtil.beginOfDay(new Date());
+                date = DateUtil.beginOfDay(new Date());
             } else {
                 final DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
-                date=DateUtil.beginOfDay(range.getStartTime());
+                date = DateUtil.beginOfDay(range.getStartTime());
             }
             final List<Long> taskIdList = coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, date, null);
             for (Long taskId : taskIdList) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingPlanMapper.java

@@ -66,7 +66,7 @@ public interface CoreEduTrainingPlanMapper extends BaseMapper<CoreEduTrainingPla
      * @return 结果
      */
 
-    Page<CoreEduTrainingPlanPageVo> selectPageData(Page<CoreEduTrainingPlanPageVo> page, @Param("request") CoreEduTrainingPlanPageDto request);
+    Page<CoreEduTrainingPlanPageVo> selectPageData(Page<CoreEduTrainingPlanPageVo> page, @Param("request") CoreEduTrainingPlanPageDto request, @Param("userOrgId") Long userOrgId);
 
     List<CoreEduTrainingPlanRoleVo> selectPlanRole(@Param("orgId") Long orgId);
 

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

@@ -106,7 +106,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             request.setBelongOrgPath(r.getPath());
         }
         //获取数据
-        Page<CoreEduTrainingPlanPageVo> page = coreEduTrainingPlanMapper.selectPageData(request.getPageRequest(), request);
+        Page<CoreEduTrainingPlanPageVo> page = coreEduTrainingPlanMapper.selectPageData(request.getPageRequest(), request, SecurityUtils.getLoginUser().getOrgId());
         SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         List<CoreEduTrainingPlanPageVo> records = page.getRecords();
         for (CoreEduTrainingPlanPageVo record : records) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppPlanMapper.java

@@ -35,7 +35,7 @@ public interface AppPlanMapper extends BaseMapper<AppPlan> {
      * @param plan
      * @return
      */
-    Page<ResumptionPlanPageVo> selectPage(Page<ResumptionPlanPageVo> page, @Param("info") CoreResumptionPlanPageDto plan);
+    Page<ResumptionPlanPageVo> selectPage(Page<ResumptionPlanPageVo> page, @Param("info") CoreResumptionPlanPageDto plan,@Param("userOrgId") Long userOrgId);
 
 //    /**
 //     *

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

@@ -125,7 +125,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     public Page<ResumptionPlanPageVo> selectPage(CoreResumptionPlanPageDto info) {
         //获取前段对应的数据库页数
         Page<ResumptionPlanPageVo> result = info.getPageDto();
-        result = baseMapper.selectPage(result, info);
+        result = baseMapper.selectPage(result, info,SecurityUtils.getLoginUser().getOrgId());
         for (ResumptionPlanPageVo record : result.getRecords()) {
             Boolean b = getHasTaskCurrentCycle(record.getPlanStatus(), record.getPlanCycle(), record.getEffectiveTime(), record.getWithdrawTime());
             record.setHasTaskCurrentCycle(b);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/CoreSafecheckPlanMapper.java

@@ -25,6 +25,7 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
     CoreSafecheckPlan get(Long id);
 
     List<CoreSafecheckPlan> selectByCycle(Long cycle);
+
     /**
      * 查询常规安全检查计划列表
      *
@@ -32,7 +33,9 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
      * @return 常规安全检查计划集合
      */
     List<CoreSafecheckPlan> selectCoreSafecheckPlanList(CoreSafecheckPlan coreSafecheckPlan);
-    Page<CoreSafecheckPlan> selectCoreSafecheckPlanPage( Page<CoreSafecheckPlan> page,@Param("check") CoreSafecheckPlan coreSafecheckPlan);
+
+    Page<CoreSafecheckPlan> selectCoreSafecheckPlanPage(Page<CoreSafecheckPlan> page, @Param("check") CoreSafecheckPlan coreSafecheckPlan, @Param("userOrgId") Long userOrgId);
+
     /**
      * 新增常规安全检查计划
      *
@@ -65,47 +68,50 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
      */
     int deleteCoreSafecheckPlanByIds(Long[] ids);
 
-    List<String> selectItemIdsByPlanId(@Param("planId")Long id);
+    List<String> selectItemIdsByPlanId(@Param("planId") Long id);
 
     /**
      * 按检查角色所属机构是行社的计划
+     *
      * @param roleIds
      * @return
      */
-    List<CoreSafecheckPlan> selectByRole(List<Long> roleIds,Long hangsheOrgId);
+    List<CoreSafecheckPlan> selectByRole(List<Long> roleIds, Long hangsheOrgId);
 
     List<CoreSafecheckPlan> selectChildren(@Param("check") CoreSafecheckPlan coreSafecheckPlan);
 
-    List<CoreSafecheckPlan> selectByPlanStatus(@Param("planStatus") int i, @Param("cycle")Integer cycle);
+    List<CoreSafecheckPlan> selectByPlanStatus(@Param("planStatus") int i, @Param("cycle") Integer cycle);
 
     Integer updateParentPlanCompletedState(@Param("planId") Long planId);
 
     /**
      * 复制一份自己
+     *
      * @param planId
      * @param newPlanId
      * @return
      */
-    Integer copySelf(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copySelf(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
     /**
      * 复制子计划
+     *
      * @param planId
      * @param newPlanId
      * @param newParentId
      * @return
      */
-    Integer copyChildren(@Param("planId") Long planId,@Param("newPlanId")Long newPlanId,@Param("newParentId")Long newParentId);
+    Integer copyChildren(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId, @Param("newParentId") Long newParentId);
 
-    Integer copyPlanPoints(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copyPlanPoints(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
-    Integer copyPlanRoles(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copyPlanRoles(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
-    Integer copyPlanExecOrgs(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copyPlanExecOrgs(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
-    Integer copyPlanBecheckedOrgs(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copyPlanBecheckedOrgs(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
-    Integer copyPlanCheckOrgType(@Param("planId") Long planId, @Param("newPlanId")Long newPlanId);
+    Integer copyPlanCheckOrgType(@Param("planId") Long planId, @Param("newPlanId") Long newPlanId);
 
     Integer physicsDeleteById(@Param("ids") List<Long> ids);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -120,7 +120,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         }
 //        coreSafecheckPlan.setPlanOfOrgId(coreSafecheckPlan.getOrgId());
         //获取数据
-        page = coreSafecheckPlanMapper.selectCoreSafecheckPlanPage(page, coreSafecheckPlan);
+        page = coreSafecheckPlanMapper.selectCoreSafecheckPlanPage(page, coreSafecheckPlan, SecurityUtils.getLoginUser().getOrgId());
         for (CoreSafecheckPlan record : page.getRecords()) {
             Boolean b = getHasTaskCurrentCycle(record.getPlanStatus(), record.getPlanCycle(), record.getEffectiveTime(), record.getWithdrawTime());
             record.setHasTaskCurrentCycle(b);

soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -100,7 +100,7 @@
         core_monitoring_retrieval_plan a
         LEFT JOIN core_monitoring_retrieval_plan b ON a.parent_id = b.id
         WHERE
-        a.is_deleted =0
+        a.is_deleted =0  and ((b.id is not null and b.org_id=#{userOrgId}) or (b.id is null and a.org_id=#{userOrgId}) or a.plan_status!=0)
         <if test="request.planName != null  and request.planName != ''">
             AND        a.plan_name like concat('%', #{request.planName}, '%')
         </if>

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

@@ -485,7 +485,7 @@
         p.category as category
 
         from core_drill_plan p left join sys_user u on p.update_by=u.id
-        where p.deleted = 0
+        where p.deleted = 0 and (p.create_org_id=#{userOrgId} or p.plan_status!=0)
        <!-- <if test="request.planRoleId!=null">
             and p.id in (<include refid="pageRoleIncludeReuqest"/>)
         </if>-->

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

@@ -448,7 +448,7 @@
         p.belong_org_id,
         p.belong_org_name
         from core_edu_training_plan p left join sys_user u on p.update_by=u.id
-        where p.deleted = 0
+        where p.deleted = 0 and (p.create_org_id=#{userOrgId} or p.plan_status!=0)
        <!-- <if test="request.planRoleId!=null">
             and p.id in ( select distinct p1.id
             from core_edu_training_plan p1

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -76,7 +76,7 @@
         LEFT JOIN sys_org o ON a.plan_of_org_id = o.id
         LEFT JOIN sys_org g ON a.plan_create_org_id = g.id
         <where>
-            a.deleted=0
+            a.deleted=0 and (a.plan_create_org_id=#{userOrgId} or a.plan_status!=0)
             <if test="info.planName != '' and info.planName != null">
                 and a.plan_name LIKE CONCAT('%', #{info.planName}, '%' )
             </if>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -259,7 +259,7 @@
         LEFT JOIN core_safecheck_plan_to_check_org_type typ ON c.id=typ.plan_id
         LEFT JOIN sys_dict_data dic ON dic.dict_value = typ.type_id
         WHERE
-        c.is_deleted='0'
+        c.is_deleted='0' and (c.plan_create_org_id=#{userOrgId} or c.plan_status!=0)
         and dic.dict_type='sys_org_type'
         <if test="check.planName != null  and check.planName != ''">
             and c.plan_name like concat('%', #{check.planName}, '%')