修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -4826,6 +4826,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 String btLastItemId = null;
                 //按人员获取
                 ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId());
+                System.out.println("renyuan==>"+ganttData.size());
                 if (user.getCompanyId()==Constant.MLD_COMPANY_ID){
                     List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
                     //是小组长
@@ -4834,7 +4835,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         projectIdList.add(-1);
                         List<Participation> participations = participationMapper.selectList(new QueryWrapper<Participation>().in("project_id", projectIdList));
                         List<String> userProjectIds = participations.stream().distinct().map(Participation::getUserId).collect(Collectors.toList());
-                        userProjectIds.removeAll(userIds);
                         userProjectIds.add("-1");
                         userIdsExtra.addAll(userProjectIds);
                         List<Map> taskPlanByGeneralMemb = projectMapper.getTaskPlanByGeneralMemb(userProjectIds, startDate, endDate, user.getCompanyId(), user.getId(),targetUserId);
@@ -4847,6 +4847,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                         ganttData.addAll(taskPlanByGeneralMemb);
                         ganttData.addAll(taskPlanWithLeave);
+                        System.out.println("renyuan0==>"+taskPlanByGeneralMemb.size());
+                        System.out.println("renyuan1==>"+taskPlanWithLeave.size());
                     }
                     //找到自己担任项目经理的项目,: is_task_plan==1 ,checkFirstId=自己的id 并且 task_status=3
                     List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().eq("incharger_id", user.getId()));
@@ -4861,6 +4863,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         for (Map map : getTaskPlanByProManager) {
                             map.put("leaderOrManager",2);
                         }
+                        System.out.println("renyuan2==>"+getTaskPlanByProManager.size());
                         ganttData.addAll(getTaskPlanByProManager);
                     }
 
@@ -4876,6 +4879,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         for (Map map : getTaskPlanByProManager) {
                             map.put("leaderOrManager",2);
                         }
+                        System.out.println("renyuan3==>"+getTaskPlanByProManager.size());
                         ganttData.addAll(getTaskPlanByProManager);
                     }
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -2739,7 +2739,7 @@
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>
-        AND project.`status` = 1
+        AND project.`status` = 1 and task.task_plan=1
         ORDER BY user.id, task.start_date
     </select>
     <select id="getTaskPlanWithLeave" resultType="java.util.Map">
@@ -2773,7 +2773,7 @@
         </foreach>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null and task.is_task_plan=1 and task.task_status=3 and task.check_first_id=#{managerId}
-        AND project.`status` = 1
+        AND project.`status` = 1 and task.task_plan=1
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>
@@ -2794,7 +2794,7 @@
         </foreach>
         and ((IFNULL(task.start_date , task.end_date) between #{startDate} and #{endDate}) or (task.end_date between #{startDate} and #{endDate}))
         and task.end_date is not null and task.is_task_plan=1 and task.task_status=4 and task.check_second_id=#{managerId}
-        AND project.`status` = 1
+        AND project.`status` = 1 and task.task_plan=1
         <if test="targetUserId !=null and targetUserId !='' ">
             and user.`id`=#{targetUserId}
         </if>