From b348482c3c96685a9e3dcbced957640c73283727 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 30 Mar 2022 08:57:19 +0800
Subject: [PATCH] 20220330

---
 src/main/java/com/ccsens/ptccsens/service/TallService.java | 2 ++
 src/main/resources/mapper_dao/ProTaskDetailDao.xml         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/ccsens/ptccsens/service/TallService.java b/src/main/java/com/ccsens/ptccsens/service/TallService.java
index b633b10..e83f19f 100644
--- a/src/main/java/com/ccsens/ptccsens/service/TallService.java
+++ b/src/main/java/com/ccsens/ptccsens/service/TallService.java
@@ -718,11 +718,13 @@ public class TallService implements ITallService {
             }
         }
 //如果查看的角色项目经理，则查看所有任务
+
         int isPm = 0;
         ProRole role = proRoleDao.selectByPrimaryKey(param.getRoleId());
         if(ObjectUtil.isNotNull(role)){
             isPm = role.getLabelId().equals(Constant.PM_LABEL_ID) ? 1 : 0;
         }
+
         //获取任务列表
         PageHelper.startPage(param.getPageNum(),param.getPageSize());
         List<TallTaskVo.QueryTask> regularTask = taskDetailDao.pageQueryRegularTask(isPm, role.getProjectId(), param.getRoleId(),queryTime,param.getTimeUnit(),param.getQueryType(),param.getTaskId(),param.getTriggerType());
diff --git a/src/main/resources/mapper_dao/ProTaskDetailDao.xml b/src/main/resources/mapper_dao/ProTaskDetailDao.xml
index 4ec9be1..14306da 100644
--- a/src/main/resources/mapper_dao/ProTaskDetailDao.xml
+++ b/src/main/resources/mapper_dao/ProTaskDetailDao.xml
@@ -487,6 +487,7 @@
         and s.plan_start_time &lt;= #{endTime}
         and s.plan_end_time &gt;= #{startTime}
     </select>
+
     <select id="pageQueryRegularTask" resultType="com.ccsensptos.tallsdk.bean.vo.TallTaskVo$QueryTask">
         SELECT
         alltask.*
@@ -552,6 +553,7 @@
         <if test="triggerType == 0 and taskId != null">
             and ts.id != #{taskId}
         </if>
+
         ) AS alltask
         LEFT JOIN t_label_business AS llbb ON alltask.detailId = llbb.business_id
         LEFT JOIN t_label AS ll ON llbb.label_id = ll.id