冲突

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

@@ -879,11 +879,11 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		//certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
 
 
-			for _, tmpUser := range userlist {
-				userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
-			}
-			userIds = strings.Trim(userIds, ",")
+		for _, tmpUser := range userlist {
+			userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
 		}
+		userIds = strings.Trim(userIds, ",")
+
 		step = 2
 		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 

src/dashoo.cn/backend/api/controllers/system/auditsetting.go

@@ -114,7 +114,6 @@ func (this *OilAuditSettingController) GetEntityList() {
 	if Remark != "" {
 		where = where + " and Remark like '%" + Remark + "%'"
 	}
-	where = where + " and OrganizeId = 1"
 	svc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	var list []auditsetting.Base_OilAuditSetting
 	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)