下拉初审人 复审人

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -134,7 +134,7 @@ func (s *OilSupplierCertService) IsCanApplyByExtOrganizeUser(applyType, departme
 }
 
 func (s *OilSupplierCertService) GetAuditUser(organizeId, auditstepcode string, entitiesPtr interface{}) {
-	where := "( a.DepartmentId=" + organizeId + " OR a.CompanyId=" + organizeId + ") and AuditStepCode='" + auditstepcode + "'"
+	where := "( a.DepartmentId in (" + organizeId + ") OR a.CompanyId in (" + organizeId + ")) and AuditStepCode='" + auditstepcode + "'"
 	//where := "a.DepartmentId=" + organizeId + " and AuditStepCode='" + auditstepcode + "'"
 	sql := "SELECT a.UserId Id, a.UserName RealName FROM Base_OilAuditSetting o LEFT JOIN OilAuditUser a ON o.Id = a.SettingId where " + where
 	s.DBE.SQL(sql).Find(entitiesPtr)

src/dashoo.cn/backend/api/controllers/casbin/organize.go

@@ -394,7 +394,7 @@ func (this *OrganizesController) ListByDeptId() {
 	//		ids = svc.GetAllChildById(companyids[len(companyids)-1])
 	//	}
 	//}
-	where := " Id in ( " + ids + " ) and AccCode='" + this.User.AccCode + "'"
+	where := " Id in ( " + ids + " )'"
 
 	list := make([]organize.Base_Organize, 0)
 	svc.GetEntities(&list, where)

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

@@ -1844,6 +1844,14 @@ func (this *OilSupplierController) CanUpdateSupplier() {
 func (this *OilSupplierController) GetAuditerByDept() {
 	Id := this.Ctx.Input.Param(":deptId")
 	auditstepcode := this.GetString("auditstepcode")
+
+	var org organize.Base_Organize
+	svc := organize.GetOrganizeService(utils.DBE)
+	has := svc.GetEntityById(Id, &org)
+	ids := Id
+	if has && org.Category == "unit" {
+		ids = svc.GetAllChildById(Id)
+	}
 	//var auditWorkflow []auditsetting.Base_OilAuditSetting
 	//rsvc := auditsetting.GetOilAuditSettingService(utils.DBE)
 	//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, Id, workflow.FIRST_TRIAL, &auditWorkflow)
@@ -1858,7 +1866,7 @@ func (this *OilSupplierController) GetAuditerByDept() {
 	//}
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(Id, auditstepcode, &users)
+	certSrv.GetAuditUser(ids, auditstepcode, &users)
 	var datainfo ErrorDataInfo
 	datainfo.Item = users
 	this.Data["json"] = &datainfo
@@ -1875,10 +1883,13 @@ func (this *OilSupplierController) GetAuditerByFist() {
 	orgSrv := organize.GetOrganizeService(utils.DBE)
 	var userentity userRole.Base_User
 	certSrv.GetEntityById(Id,&userentity)
-	comid := orgSrv.GetMyUnitDepartmentId(userentity.Departmentid)
+
+	svc := organize.GetOrganizeService(utils.DBE)
+	unitId := svc.GetMyUnitDepartmentId(userentity.Departmentid)
+	ids := svc.GetAllChildById(unitId)
 	//depId := strings.Split(userentity.Superior,",")
 	var users []userRole.Base_RoleList
-	certSrv.GetAuditUser(comid, auditstepcode, &users)
+	certSrv.GetAuditUser(ids, auditstepcode, &users)
 	var datainfo ErrorDataInfo
 	datainfo.Item = users
 	this.Data["json"] = &datainfo

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

@@ -55,8 +55,8 @@ func (this *OilAuditSettingController) GetEntityList() {
 	Code := this.GetString("Code")
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.AuditSetting.AllRecord")
-	svcuser := organize.GetOrganizeService(utils.DBE)
-	isauth = svcuser.UserInRoleById(this.User.Id, "10000203")
+	//svcuser := organize.GetOrganizeService(utils.DBE)
+	//isauth = svcuser.UserInRoleById(this.User.Id, "10000203")
 
 
 	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
@@ -76,7 +76,7 @@ func (this *OilAuditSettingController) GetEntityList() {
 	}
 
 	if Code != "" {
-		where = where + " and AuditStepCode like '%" + Code + "%'"
+		where = where + " and AuditStepCode = '" + Code + "'"
 	}
 
 	if AuditStepName != "" {

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor.vue

@@ -152,7 +152,7 @@
 
         let deptid = data.id
         this.userOptions = []
-        let auditstepcode = 'FIRST_TRIAL'
+        let auditstepcode = 'FIRST_TRIAL' // 初审人
         supapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.userOptions = res.data.item
           if (res.data.item != null && res.data.item.length > 0) {

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/_opera/operation.vue

@@ -369,6 +369,9 @@
               // 企业法规处审核
               this.formData.AuditStepCode = 'PROF_REGULATION'
               this.formData.AuditStepName = '企业法规处审核'
+            } else if (this.step == 7) {
+              this.formData.AuditStepCode = 'SUB_OFFICE'
+              this.formData.AuditStepName = '二级单位分办'
             }
             // this.formData.WorkFlowName = this.$refs.selectWorkFlow.selectedLabel + ''
             if (!this.userselectOptions || this.userselectOptions.length <= 0) {

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -258,6 +258,9 @@
       } else if (this.$route.query.step == 6) {
         //企业法规处审核
         this.ACode = "PROF_REGULATION"
+      } else if (this.$route.query.step == 7) {
+        // 二级单位分办
+        this.ACode = "SUB_OFFICE"
       }
       this.initDatas()
       // his.getDictOptions()
@@ -282,7 +285,10 @@
       } else if (val.query.step == 6) {
         //企业法规处审核
         this.ACode = "PROF_REGULATION"
-      }
+      } else if (val.query.step == 7) {
+          // 二级单位分办
+          this.ACode = 'SUB_OFFICE'
+        }
         this.initDatas()
       }
     },