准入审批

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

@@ -985,8 +985,8 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 				}
-			} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS {
-				if supplierCertEntity.InStyle == "3" {
+			} else if supplierCertEntity.Status == suppliercert.PROF_AUDIT_STATUS && supplierCertEntity.InStyle == "3" {
+				//if supplierCertEntity.InStyle == "3" {
 					supplierCertEntity.Status = suppliercert.STOREING_STATUS
 					supplierCertEntity.Step = 3
 					cols := []string{
@@ -994,7 +994,15 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 						"Step",
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-				}
+				//} else {
+				//	supplierCertEntity.Status = status
+				//	supplierCertEntity.Step = step
+				//	cols := []string{
+				//		"Status",
+				//		"Step",
+				//	}
+				//	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+				//}
 			} else {
 				supplierCertEntity.Status = status
 				supplierCertEntity.Step = step
@@ -1089,20 +1097,25 @@ func (this *OilSupplierCertController) AuditCallback() {
 func (this *OilSupplierCertController) IsAccess() {
 	auditstepcode := this.GetString("auditstepcode")
 
-	var users []userRole.Base_RoleList
-	var auditWorkflow auditsetting.Base_OilAuditSetting
-	rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
+	//var users []userRole.Base_RoleList
+	//var auditWorkflow auditsetting.Base_OilAuditSetting
+	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	res := false
 
 	if auditstepcode == workflow.PROF_CONCENT { // 集中审批
-		rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.PROF_AUDIT, &auditWorkflow)
-		users = rsvc.GetUserByRole("10000204", this.User.AccCode)
-		for _, user := range users {
-			if this.User.Id == strconv.Itoa(int(user.Id))  {
-				res = true
-				break
-			}
-		}
+		//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.PROF_AUDIT, &auditWorkflow)
+		//users = rsvc.GetUserByRole("10000204", this.User.AccCode)
+		//for _, user := range users {
+		//	if this.User.Id == strconv.Itoa(int(user.Id))  {
+		//		res = true
+		//		break
+		//	}
+		//}
+		var setting auditsetting.Base_OilAuditSetting
+		svc := organize.GetOrganizeService(utils.DBE)
+		where := "AuditStepCode='" + auditstepcode + "'"
+		svc.GetEntity(&setting, where)
+		res = svc.UserInRoleById(this.User.Id, strconv.Itoa(setting.RoleId))
 	} else {
 		//var users []suppliercert.UserList
 		//where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + auditstepcode + "'"