前后:合同列表查看本单位的;评价列表查看自己创建的和待办的

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

@@ -248,6 +248,17 @@ func (this *PermissionController) GetAuditPermForProf() {
 	this.ServeJSON()
 }
 
+// @Title 当前登录人的unitId
+// @Description get user by token
+// @Param	uid		path 	string	true		"The key for staticblock"
+// @Success 200 {object} models.User
+// @Failure 403 :uid is empty
+// @router /getAuditId [get]
+func (this *PermissionController) GetAuditId() {
+	this.Data["json"] = this.User.UnitId
+	this.ServeJSON()
+}
+
 // @Title get
 // @Description get user by token
 // @Param	uid		path 	string	true		"The key for staticblock"

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -418,12 +418,12 @@ func (this *OilContractController) GetEntityList() {
 	wherePRegAudit := "AuditStepCode='PROF_REGULATION'"
 	orgSvc.GetEntity(&settingReg, wherePRegAudit) // PROF_AUDIT
 	res1 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingReg.RoleId))
-	// 所有业务处室分办单位可查看所有合同 TODO 待确认
-	var settingProf auditsetting.Base_OilAuditSetting
-	wherePAudit := "AuditStepCode='PROF_RECE'"
-	orgSvc.GetEntity(&settingProf, wherePAudit) // PROF_AUDIT
-	res2 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingProf.RoleId))
-	if !res1 && !res2 {
+	// 所有业务处室分办单位可查看所有合同
+	//var settingProf auditsetting.Base_OilAuditSetting
+	//wherePAudit := "AuditStepCode='PROF_RECE'"
+	//orgSvc.GetEntity(&settingProf, wherePAudit) // PROF_AUDIT
+	//res2 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingProf.RoleId))
+	if !res1 {
 		where = where + " and a.SecondUnit= " + strconv.Itoa(this.User.UnitId)
 	}
 
@@ -829,11 +829,11 @@ func (this *OilContractController) ExportList() {
 	orgSvc.GetEntity(&settingReg, wherePRegAudit) // PROF_AUDIT
 	res1 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingReg.RoleId))
 	// 所有业务处室分办单位可查看所有合同 TODO 待确认
-	var settingProf auditsetting.Base_OilAuditSetting
-	wherePAudit := "AuditStepCode='PROF_RECE'"
-	orgSvc.GetEntity(&settingProf, wherePAudit) // PROF_AUDIT
-	res2 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingProf.RoleId))
-	if !res1 && !res2 {
+	//var settingProf auditsetting.Base_OilAuditSetting
+	//wherePAudit := "AuditStepCode='PROF_RECE'"
+	//orgSvc.GetEntity(&settingProf, wherePAudit) // PROF_AUDIT
+	//res2 := orgSvc.UserInRoleById(this.User.Id, strconv.Itoa(settingProf.RoleId))
+	if !res1 {
 		where = where + " and a.SecondUnit= " + strconv.Itoa(this.User.UnitId)
 	}
 

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -158,9 +158,36 @@ func (this *OilContractReviewController) GetEntityList() {
 	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_contract.Review.AllRecord")
 	if !isauth {
 		// 权限过滤  自己创建的评价 ，同二级部门创建的评价 ，企管法规处能看
-		where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
-		where = where + " or r.UnitId = '" + strconv.Itoa(this.User.UnitId) + "' "
-		where = where + " )"
+		//where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
+		//where = where + " or r.UnitId = '" + strconv.Itoa(this.User.UnitId) + "' "
+		//where = where + " )"
+		//根据工作流查找
+		//集中评审相关人可看数据
+		actisvc := workflow.GetActivitiService(utils.DBE)
+		//找出待办任务===准入
+		var certIdList string
+		ids := actisvc.GetMyTasks(workflow.OIL_DAILY_CONTRACT_EVALUATION, this.User.Id)
+		ids1 := actisvc.GetMyTasks(workflow.OIL_DAILY_CONTRACT_EVA_BY_BUSINESS, this.User.Id)
+		ids += "," + ids1
+		if len(strings.Trim(ids, ",")) > 0 {
+			certIdList += strings.Trim(ids, ",") + ","
+		}
+
+		certIdList = strings.Trim(certIdList, ",")
+		certIdarr := strings.Split(certIdList, ",")
+		for i, item := range certIdarr {
+			idx := strings.Index(item, "-")
+			if idx >= 0 {
+				certIdarr[i] = strings.Split(item, "-")[0]
+			}
+		}
+		certIdList = strings.Join(certIdarr, ",")
+
+		if certIdList != "" {
+			where += " and ( r.Id in (" + certIdList + ")" + " or r.CreateUserId = '" + this.User.Id + "')"
+		} else {
+			where = where + " and r.CreateUserId = '" + this.User.Id + "'"
+		}
 	}
 
 	svc := contractReview.GetOilContractReviewService(utils.DBE)

src/dashoo.cn/frontend_web/src/api/oilcontract/permission.js

@@ -12,6 +12,12 @@ export default {
       method: 'GET'
     })
   },
+  getAuditId (myAxios) {
+    return myAxios({
+      url: '/permission/getAuditId',
+      method: 'GET'
+    })
+  },
   getBatchAuditPermission (myAxios) {
     return myAxios({
       url: '/permission/batch-audit',

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -1598,6 +1598,14 @@
       getAuditPermForProf () {
         permissionApi.getAuditPermForProf(this.$axios).then(res => {
           this.importAuditProf = res.data
+          this.getAuditId()
+        })
+      },
+      getAuditId () {
+        permissionApi.getAuditId(this.$axios).then(res => {
+          if (!this.importAuditProf) {
+            this.searchForm.SecondUnit = res.data
+          }
         })
       }
     }