fix 客户审批，允许其他角色审批 客户审批单

controllers/approval.go

@@ -168,7 +168,7 @@ func (c *ApprovalCommon) DetailOld() {
 		pars = append(pars, sysUser.AdminId)
 	}
 
-	item, err := company_approval.GetApprovalListByApprovalId(condition, pars, companyApprovalId)
+	item, err := company_approval.GetApprovalInfoByApprovalId(condition, pars, companyApprovalId)
 	if err != nil {
 		c.FailWithMessage("获取失败", "获取数据失败，Err:"+err.Error())
 		return

controllers/approval_new.go

@@ -12,7 +12,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
-	"hongze/hongze_mobile_admin/services"
 	company_apply "hongze/hongze_mobile_admin/services/company_approval"
 	"hongze/hongze_mobile_admin/utils"
 	"rdluck_tools/paging"
@@ -455,32 +454,39 @@ func (c *ApprovalCommon) ApplyApprove() {
 		c.FailWithMessage("参数解析异常！", "参数解析失败，Err:"+err.Error())
 		return
 	}
-	roleTypeCode := sysUser.RoleTypeCode
-	productId := services.GetProductId(roleTypeCode)
-	if productId == 0 {
-		c.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
-		return
-	}
+	//roleTypeCode := sysUser.RoleTypeCode
+	//productId := services.GetProductId(roleTypeCode)
+	//if productId == 0 {
+	//	c.FailWithMessage("参数错误", "参数解析失败，Err:"+"客户类型为："+roleTypeCode)
+	//	return
+	//}
 	if req.CompanyId <= 0 {
 		c.FailWithMessage("参数错误", "客户Id小于等于0")
 		return
 	}
+	var condition string
+	var pars []interface{}
+	approvalItem, err := company_approval.GetApprovalInfoByApprovalId(condition, pars, req.CompanyApprovalId)
+	if err != nil {
+		c.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
+	}
+
 	if req.Status != 1 && req.Status != 2 {
 		c.FailWithMessage("参数错误", "审批状态Id小于等于0")
 		return
 	}
-	companyProduct, err := company_product.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, productId)
+	companyProduct, err := company_product.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, approvalItem.ProductId)
 	if err != nil {
 		c.FailWithMessage("获取信息失败", "获取信息失败,Err:"+err.Error())
 		return
 	}
 	if companyProduct == nil {
-		c.FailWithMessage("获取审批信息失败", "获取信息失败,Err:"+err.Error())
+		c.FailWithMessage("获取审批信息失败", "获取信息失败,companyProduct is null")
 		return
 	}
-
+	//CompanyApprovalId
 	//数据校验（校验是否具有审批权限）
-	_, _, approvalRecord, err := company_apply.CheckApproveAuth(req.CompanyId, productId, sysUser)
+	_, _, approvalRecord, err := company_apply.CheckApproveAuth(req.CompanyId, approvalItem.ProductId, sysUser)
 	//真实审核操作
 	if req.Status == 1 {
 		err = company_apply.Approved(approvalRecord, sysUser, req.Remark)

models/tables/company_approval/company_approval.go

@@ -139,7 +139,8 @@ func GetApprovalList(condition string, pars []interface{}, startSize, pageSize i
 	return
 }
 
-func GetApprovalListByApprovalId(condition string, pars []interface{}, companyApprovalId int) (item *CompanyApprovalList, err error) {
+// GetApprovalInfoByApprovalId 根据客户单id获取客户客户审批单信息
+func GetApprovalInfoByApprovalId(condition string, pars []interface{}, companyApprovalId int) (item *CompanyApprovalList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT a.company_id,b.product_id,a.company_name,a.credit_code,a.address,b.company_type,b.industry_name,
 			b.seller_name,b.create_time,b.freeze_start_date,b.freeze_end_date,b.source,c.create_time AS approval_time,c.approve_time,b.status,

services/company_approval/company_approval.go

@@ -954,7 +954,7 @@ func GetOpButton(approvalItem *company_approval.CompanyApprovalList, contractApp
 func GetApprovalDetailByCompanyApprovalId(companyApprovalId int, opUser *custom.AdminWx) (approvalItem *company_approval.CompanyApprovalList, flowNodeListResp [][]contract_approval_record.ContractApprovalRecord, err error) {
 	var condition string
 	var pars []interface{}
-	approvalItem, err = company_approval.GetApprovalListByApprovalId(condition, pars, companyApprovalId)
+	approvalItem, err = company_approval.GetApprovalInfoByApprovalId(condition, pars, companyApprovalId)
 	if err != nil {
 		err = errors.New("获取客户单详情失败,ERR:" + err.Error())
 		return