fix：审批后不给抄送人发送消息的bug修复

models/tables/contract/contract.go

@@ -22,6 +22,7 @@ type Contract struct {
 	OriginalPrice     float64   `description:"合同原金额，优惠前的金额"`
 	Price             float64   `description:"实际金额，优惠后的金额"`
 	PayRemark         string    `description:"付款方式说明,长度255位"`
+	PayChannel        string    `description:"付款渠道,长度255位"`
 	CompanyName       string    `description:"客户名称，甲方名称,长度32位"`
 	CreditCode        string    `description:"社会统一信用代码,长度64位"`
 	ProvinceId        int       `description:"省级id"`
@@ -78,6 +79,7 @@ type ContractDetail struct {
 	OriginalPrice     float64   `description:"合同原金额，优惠前的金额"`
 	Price             float64   `description:"实际金额，优惠后的金额"`
 	PayRemark         string    `description:"付款方式说明,长度255位"`
+	PayChannel        string    `description:"付款渠道,长度255位"`
 	CompanyName       string    `description:"客户名称，甲方名称,长度32位"`
 	CreditCode        string    `description:"社会统一信用代码,长度64位"`
 	ProvinceId        int       `description:"省级id"`

models/tables/contract_approval_record/contract_approval_record.go

@@ -75,7 +75,7 @@ func GetContractApprovalRecordListByContractIdAndNode(contractApprovalId, nodeId
 	o := orm.NewOrm()
 	sql := `select a.* from contract_approval_record a 
  join contract_approval b on a.contract_approval_id=b.contract_approval_id
- where a.status = "待审批" 
+ where 1=1 
   AND a.contract_approval_id=? AND node_id  = ? order by a.node_id asc`
 	_, err = o.Raw(sql, contractApprovalId, nodeId).QueryRows(&contractApprovalRecordList)
 	return

services/seal/approval.go

@@ -13,6 +13,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/seal"
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/services/flow"
+	"hongze/hongze_mobile_admin/utils"
 	"strconv"
 	"strings"
 	"time"
@@ -55,11 +56,9 @@ func CheckApply(sealInfo *seal.Seal, opUser *custom.AdminWx) (err error) {
 		}
 	}
 
-	fmt.Println("contractApprovalRecord:", contractApprovalRecord)
 	//如果一级审批人和当前提交人一致，那么审批通过，且不发送消息给一级审批人
 	if contractApprovalRecord != nil {
 		sealInfo, approvalInfo, approvalRecord, tmpErr := CheckApproveAuth(sealInfo.SealId, opUser)
-		fmt.Println(sealInfo, approvalInfo, approvalRecord, tmpErr)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -527,6 +526,12 @@ func approvedByCc(approvedRemark string, sourceApprovalRecord *contract_approval
 
 //抄送信息给用户（根据节点来推送）
 func messageToNodeUser(flowNodeId, createUserId, contractApprovalId, messageType, approvalStatus int, companyName, content string) (err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendEmail("抄送信息给用户失败"+time.Now().Format("2006-01-02 15:04:05"), ";Err:"+err.Error(), utils.EmailSendToUsers)
+			utils.FileLog.Info("抄送信息给用户失败,Err:%s,%s", err.Error())
+		}
+	}()
 	//获取审批单中抄送节点的所有数据列表
 	contractApprovalRecordList, err := contract_approval_record.GetContractApprovalRecordListByContractIdAndNode(contractApprovalId, flowNodeId)
 	if err != nil {