no message

models/seal/seal.go

@@ -236,9 +236,10 @@ func GetList(condition string, pars []interface{}, startSize, pageSize int) (lis
 //}
 
 type SealApprovalItem struct {
-	ContractApprovalId       int `description:"审批单ID"`
-	ContractId               int `description:"合同ID"`
-	ContractApprovalRecordId int `description:"审批流ID"`
+	ContractApprovalId       int    `description:"审批单ID"`
+	ContractId               int    `description:"合同ID"`
+	ContractApprovalRecordId int    `description:"审批流ID"`
+	Code                     string `description:"合同编号"`
 	//ContractCode             string                  `description:"合同编号"`
 	Use            string                  `description:"用印用途,枚举值：'销售合同','渠道合同','付款通知函','招投标','战略合作协议'"`
 	ContractType   string                  `description:"合同类型,枚举值：'新签合同','续约合同','补充协议','代付合同'"`

services/seal/seal.go

@@ -675,16 +675,12 @@ func GetSealApprovalPageList(condition, joinCondition string, pars []interface{}
 
 			// 合同编码
 
-			//if selfContract, has := selfContractMap[item.ContractId]; has {
-			//	list[i].ContractCode = selfContract.ContractCode
-			//} else {
-			//	if item.ProductId == utils.COMPANY_PRODUCT_RAI_ID {
-			//		list[i].ContractCode = item.Code
-			//	}
-			//}
-
 			if selfContract, has := selfContractMap[item.ContractId]; has {
 				list[i].ContractCode = selfContract.ContractCode
+			} else {
+				if item.ProductId == utils.COMPANY_PRODUCT_RAI_ID {
+					list[i].ContractCode = item.Code
+				}
 			}
 
 			// 取出item对应approval_id的审批流