修改全部代办bug

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -231,6 +231,7 @@ func (this *LimsDataEntryController) GetToDoList() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var processInstanceId string
 	var RoleSet auditsetting.Base_OilAuditSetting
+	ListDone := make([]workflow.ActiMyTasksRetWithTimeVM, 0)
 	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.DATAAUDIT, &RoleSet)
 	//processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
@@ -240,10 +241,31 @@ func (this *LimsDataEntryController) GetToDoList() {
 	} else if queryTaskStatus == "1" { //待办
 		processInstanceId = svcActiviti.GetMyTasks(RoleSet.WorkFlowCord, this.User.Id)
 	} else if queryTaskStatus == "2" { //已办
-		processInstanceId = svcActiviti.GetAllMyTasks(RoleSet.WorkFlowCord, this.User.Id)
+		ListDone = svcActiviti.GetMyFinishedTasksWithTime(RoleSet.WorkFlowCord, this.User.Id)
+
+		for _, value := range ListDone {
+			processInstanceId = processInstanceId + value.BusinessKey + ","
+		}
+		processInstanceId = strings.Trim(processInstanceId, ",")
 	} else {
 
 	}
+	organizeSvc := organize.GetOrganizeService(utils.DBE)
+	departList := organizeSvc.GetChildByTopId(this.User.DepartmentId)
+	//取出当前部门及下级部门的所有用户列表
+	var subUserList []userRole.Base_User
+	whereUser := " 1=1 "
+	whereUser += " and DepartmentId in (" + departList + ")"
+	svc.GetEntities(&subUserList, whereUser)
+	var userIds string
+
+	for _, tmpUser := range subUserList {
+		userIds += strconv.Itoa(tmpUser.Id) + ","
+	}
+	userIds = strings.Trim(userIds, ",")
+
+	where := " 1=1 "
+	where += " AND a.CreateUserId in (" + userIds + ")"
 
 	//switch this.User.DepartmentId {
 	//case "100000150":
@@ -268,7 +290,7 @@ func (this *LimsDataEntryController) GetToDoList() {
 	if Order != "" && Prop != "" {
 		orderby = Prop + " " + Order
 	}
-	where := " b.BalanceStatus <> 0 "
+	where += " and b.BalanceStatus <> 0 "
 	if len(processInstanceId) > 0 {
 		where += " and a.Id in (" + processInstanceId + ")"
 	}