Преглед изворни кода

fix(消息列表):调整返回的申请单详情

Roc пре 3 година
родитељ
комит
6dba4c7ff6
2 измењених фајлова са 4 додато и 4 уклоњено
  1. 2 2
      controllers/contract_approval.go
  2. 2 2
      controllers/seal_approval.go

+ 2 - 2
controllers/contract_approval.go

@@ -224,7 +224,7 @@ func (this *ContractApprovalCommon) Detail() {
 		this.FailWithMessage("获取审批单失败!", "获取审批单失败,Err:"+err.Error())
 		return
 	}
-	var contractDetail *contract.ContractDetail
+	contractDetail := new(contract.ContractDetail)
 	jsonErr := json.Unmarshal([]byte(contractApprovalInfo.ContractDetail), contractDetail)
 	if jsonErr != nil {
 		this.FailWithMessage("审批合同数据转换失败!", "审批合同数据转换失败,Err:"+jsonErr.Error())
@@ -307,7 +307,7 @@ func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId in
 		return
 	}
 
-	var detail *contract.ContractDetail
+	detail := new(contract.ContractDetail)
 	jsonErr := json.Unmarshal([]byte(contractApprovalInfo.ContractDetail), detail)
 	if jsonErr != nil {
 		this.FailWithMessage("获取审批单失败", "审批合同数据转换失败,Err:"+jsonErr.Error())

+ 2 - 2
controllers/seal_approval.go

@@ -235,7 +235,7 @@ func (this *SealApprovalCommon) Detail() {
 		this.FailWithMessage("获取审批单失败!", "获取审批单失败,Err:"+err.Error())
 		return
 	}
-	var sealDetail *seal.Seal
+	sealDetail := new(seal.Seal)
 	jsonErr := json.Unmarshal([]byte(contractApprovalInfo.ContractDetail), sealDetail)
 	if jsonErr != nil {
 		this.FailWithMessage("审批合同数据转换失败!", "审批合同数据转换失败,Err:"+jsonErr.Error())
@@ -311,7 +311,7 @@ func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
 		return
 	}
 
-	var sealDetail *seal.Seal
+	sealDetail := new(seal.Seal)
 	jsonErr := json.Unmarshal([]byte(contractApprovalInfo.ContractDetail), sealDetail)
 	if jsonErr != nil {
 		this.FailWithMessage("获取审批单失败", "审批合同数据转换失败,Err:"+jsonErr.Error())