待办

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1033,7 +1033,7 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 				where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 			}
 		} else {
-			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+			//where = where + " and a.CreateUserId = '" + this.User.Id + "'"
 		}
 	}
 

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -290,28 +290,34 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 	if stype == "1" || stype == "" {
 		//已办任务===准入
 		var certIdList string
-		if actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
-			certIdList = actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+		ids := actisvc.GetHistoryMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
+			certIdList = ids
 			certIdList = certIdList + ","
 		}
-		if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
-			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, ids)
 			certIdList = certIdList + ","
 		}
-		if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
-			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, ids)
 			certIdList = certIdList + ","
 		}
-		if actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
 			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
 			certIdList = certIdList + ","
 		}
-		if actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, ids)
 			certIdList = certIdList + ","
 		}
-		if actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-			certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
+		ids = actisvc.GetHistoryMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id)
+		if ids != "" {
+			certIdList = fmt.Sprintf("%s %s", certIdList, ids)
 			certIdList = certIdList + ","
 		}
 		certIdList = strings.Trim(certIdList, ",")