fix 审批列表，一级审批人驳回，二级审批人不允许看到一级审批人的驳回信息

controllers/approval_new.go

@@ -55,7 +55,7 @@ func (c *ApprovalCommon) ListV2() {
 
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
-		condition += ` AND (c.apply_user_id = ? or d.approve_user_id = ?)`
+		condition += ` AND (c.apply_user_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id) )`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
 

controllers/contract.go

@@ -117,7 +117,7 @@ func (c *ContractCommon) CompanyList() {
 	if status == "待审批" {
 		condition += ` AND ((c.seller_id = ? and a.start_node_id = a.curr_node_id) OR (d.approve_user_id = ? )) and d.status="待审批" `
 	} else {
-		condition += ` AND (c.seller_id = ? or (d.approve_user_id = ? and c.status != "已撤回") )`
+		condition += ` AND (c.seller_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id and c.status != "已撤回") )`
 	}
 	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 

controllers/contract_approval.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"fmt"
 	contractReq "hongze/hongze_mobile_admin/models/request/contract"
 	contractResp "hongze/hongze_mobile_admin/models/response/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
@@ -76,7 +77,7 @@ func (c *ContractApprovalCommon) List() {
 		joinCondition = " and a.curr_node_id!=d.node_id"
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
-		condition += ` AND (c.seller_id = ? or d.approve_user_id = ?)`
+		condition += ` AND (c.seller_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id))`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
 
@@ -87,9 +88,17 @@ func (c *ContractApprovalCommon) List() {
 		pars = append(pars, contractType)
 	}
 	//审批状态
+	fmt.Println(status)
 	if status != "" {
 		if status == "已审批" {
 			condition += ` AND c.status in ("已审批","已驳回")  `
+		} else if status == "其它" {
+			if sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER || sysUser.RoleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP {
+				condition += ` AND c.status in ("已撤回","已作废")  `
+			} else {
+				condition += ` AND c.status = ? `
+				pars = append(pars, "已作废")
+			}
 		} else {
 			condition += ` AND c.status = ? `
 			if status == "处理中" {

controllers/seal.go

@@ -330,7 +330,7 @@ func (c *SealCommon) CompanyList() {
 	pars := make([]interface{}, 0)
 
 	//归属
-	condition += ` AND (c.user_id = ? or d.approve_user_id = ?)`
+	condition += ` AND (c.user_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id))`
 	pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	condition += ` AND (c.company_name like "%` + keyword + `%" or c.credit_code like "%` + keyword + `%")`
 

controllers/seal_approval.go

@@ -15,7 +15,7 @@ import (
 	"strings"
 )
 
-//用印审批模块
+//SealApprovalCommon 用印审批模块
 type SealApprovalCommon struct {
 	BaseAuth
 }
@@ -81,7 +81,7 @@ func (c *SealApprovalCommon) List() {
 		joinCondition = " and a.curr_node_id!=d.node_id"
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	} else {
-		condition += ` AND (c.user_id = ? or d.approve_user_id = ?)`
+		condition += ` AND (c.user_id = ? or (d.approve_user_id = ? and d.node_id <= a.curr_node_id))`
 		pars = append(pars, sysUser.AdminId, sysUser.AdminId)
 	}
 
@@ -381,6 +381,7 @@ func (c *SealApprovalCommon) Reject() {
 	c.OkWithMessage("驳回成功")
 }
 
+// Approved
 // @Title 处理审批单
 // @Description 处理审批单
 // @Param	request	body seal.ApprovedReq true "type json string"
@@ -414,6 +415,7 @@ func (c *SealApprovalCommon) Approved() {
 	c.OkWithMessage("审核通过")
 }
 
+// CancelApply
 // @Title 撤回审批申请
 // @Description 撤回审批申请接口
 // @Param   SealId   query   int  true       "用印id编号"