fix：创建申请单bug修复

controllers/contract.go

@@ -60,7 +60,7 @@ func (this *ContractCommon) Detail() {
 	//获取合同详情
 	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractId, this.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取最近一次审批单信息失败,ERR:"+err.Error())
+		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{

controllers/contract_approval.go

@@ -260,7 +260,7 @@ func (this *ContractApprovalCommon) Detail() {
 	//合同详情
 	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, this.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取最近一次审批单信息失败,ERR:"+err.Error())
+		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{
@@ -288,7 +288,7 @@ func (this *ContractApprovalCommon) detailByApprovalRecordId(approvalRecordId in
 	//合同详情
 	contractInfo, flowNodeListResp, contractOpButton, err := contractService.GetContractDetailByContractId(contractApprovalInfo.ContractId, this.AdminWx)
 	if err != nil {
-		this.FailWithMessage("获取合同详情失败！", "获取最近一次审批单信息失败,ERR:"+err.Error())
+		this.FailWithMessage("获取合同详情失败！", "获取合同详情失败,ERR:"+err.Error())
 		return
 	}
 	resp := contractResp.ContractDetailResp{

services/contract/contract.go

@@ -167,16 +167,18 @@ func GetContractDetailByContractId(contractId int, opUser *custom.AdminWx) (cont
 	//查询最近一次审批单信息
 	lastApprovalInfo, err := contract_approval.GetLastContractApprovalByContractId(contractInfo.ContractId, "contract")
 	if err != nil {
-		if err.Error() != utils.NotEmpty() {
+		if err.Error() != utils.ErrNoRow() {
 			err = errors.New("获取最近一次审批单信息失败,ERR:" + err.Error())
-			return
 		}
+		err = nil
+		return
 	}
 	if lastApprovalInfo != nil {
 		//审批操作权限，上传签回文件权限
-		tmpContractOpButton, tmpFlowNodeListResp, err := GetOpButton(contractInfo, lastApprovalInfo, opUser)
-		if err != nil {
-			err = errors.New("获取合同详情失败,ERR:" + err.Error())
+		tmpContractOpButton, tmpFlowNodeListResp, tmpErr := GetOpButton(contractInfo, lastApprovalInfo, opUser)
+		if tmpErr != nil {
+			err = errors.New("获取合同按钮权限、审批流程失败,ERR:" + tmpErr.Error())
+			return
 		}
 		opButton = tmpContractOpButton
 		flowNodeListResp = tmpFlowNodeListResp

services/seal/approval.go

@@ -153,6 +153,7 @@ func apply(sealInfo *seal.Seal) (approval *contract_approval.ContractApproval, c
 				NodeId:              nodeItem.NodeId,
 				NodeType:            nodeItem.NodeType,
 				NextNodeId:          nodeItem.NextNodeId,
+				PrevNodeId:          nodeItem.PrevNodeId,
 				CreateTime:          time.Now(),
 				ModifyTime:          time.Now(),
 			}

services/seal/seal.go

@@ -286,6 +286,7 @@ func GetOpButton(sealInfo *seal.Seal, contractApprovalInfo *contract_approval.Co
 	flowNodeMap := make(map[int][]contract_approval_record.ContractApprovalRecord, 0)
 	keySort := make([]int, 0)
 	for _, approvalRecord := range approvalRecordList {
+		fmt.Println(approvalRecord)
 		//如果当前节点正好是该节点，同时审批单状态是待审批状态，然后当前账号又有权限，该账号也正是审批人，那么允许审批操作
 		if contractApprovalInfo.CurrNodeId == approvalRecord.NodeId && contractApprovalInfo.Status == "待审批" {
 			if opUser.AdminId == approvalRecord.ApproveUserId && approvalRecord.NodeType == "check" {
@@ -342,18 +343,19 @@ func GetSealDetailBySealId(sealId int, opUser *custom.AdminWx) (sealInfo *seal.S
 
 	//查询最近一次审批单信息
 	lastApprovalInfo, err := contract_approval.GetLastContractApprovalByContractId(sealInfo.SealId, "seal")
-
 	if err != nil {
-		if err.Error() != utils.NotEmpty() {
+		if err.Error() != utils.ErrNoRow() {
 			err = errors.New("获取最近一次审批单信息失败,ERR:" + err.Error())
-			return
 		}
+		err = nil
+		return
 	}
 	if lastApprovalInfo != nil {
 		//获取审批操作和审批流数据
-		tmpSealOpButton, tmpFlowNodeListResp, err := GetOpButton(sealInfo, lastApprovalInfo, opUser)
-		if err != nil {
-			err = errors.New("获取用印详情失败，Err:" + err.Error())
+		tmpSealOpButton, tmpFlowNodeListResp, tmpErr := GetOpButton(sealInfo, lastApprovalInfo, opUser)
+		if tmpErr != nil {
+			err = errors.New("获取用印按钮权限、审批流程失败，Err:" + tmpErr.Error())
+			return
 		}
 		opButton = tmpSealOpButton
 		flowNodeListResp = tmpFlowNodeListResp