调整任务列表输出

@@ -521,7 +521,7 @@ func (srv StaffAssessServeice) buildTaskRecord(staffAssess *domain.StaffAssess)
 	nowTime := time.Now()
 	nowTime := time.Now()
 	for index := range taskList2 {
 	for index := range taskList2 {
 		if taskList2[index].UseEndTime > 0 {
 		if taskList2[index].UseEndTime > 0 {
-			if !(taskList2[index].EndTime > nowTime.Unix()) {
+			if taskList2[index].EndTime < nowTime.Unix() {
 				continue
 				continue
 			}
 			}
 		}
 		}

@@ -1367,7 +1367,9 @@ func (srv TaskService) ListTask3(param *command.SearchTaskCommand) (map[string]i
 					tk.Marks["d"] = val3.Marks["d"]
 					tk.Marks["d"] = val3.Marks["d"]
 				}
 				}
 			case domain.AnomalyCategoryType3:
 			case domain.AnomalyCategoryType3:
-				if isChildUser {
+				if userId == val.LeaderId {
+					//空
+				} else if isChildUser {
 					// 去辅导
 					// 去辅导
 					tk.Marks["d"] = val3.Marks["d"]
 					tk.Marks["d"] = val3.Marks["d"]
 				}
 				}
@@ -1648,7 +1650,9 @@ func (srv TaskService) listTask3ForHrbp(param *command.SearchTaskCommand) (map[s
 					tk.Marks["d"] = val3.Marks["d"]
 					tk.Marks["d"] = val3.Marks["d"]
 				}
 				}
 			case domain.AnomalyCategoryType3:
 			case domain.AnomalyCategoryType3:
-				if isChildUser {
+				if userId == val.LeaderId {
+					//空
+				} else if isChildUser {
 					// 去辅导
 					// 去辅导
 					tk.Marks["d"] = val3.Marks["d"]
 					tk.Marks["d"] = val3.Marks["d"]
 				}
 				}