|
|
@@ -135,8 +135,7 @@ func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppr
|
|
|
}
|
|
|
|
|
|
//用印状态判断
|
|
|
- ignoreStatus := []string{"待提交", "已撤回", "已驳回"}
|
|
|
- if !strings.Contains(strings.Join(ignoreStatus, ","), sealInfo.Status) {
|
|
|
+ if sealInfo.Status != "待审批" {
|
|
|
err = errors.New("用印状态异常，不允许修改，当前用印状态：" + sealInfo.Status)
|
|
|
return
|
|
|
}
|
|
|
@@ -183,6 +182,12 @@ func CheckEdit(sealInfo *seal.Seal, approvalInfo *contract_approval.ContractAppr
|
|
|
sealInfo.ModifyTime = time.Now()
|
|
|
checkEdit(sealInfo, updateCol, approvalRecord.ContractApprovalRecordId, content, opUser)
|
|
|
|
|
|
+ //重新获取最新的用印单
|
|
|
+ sealInfo, tmpErr := seal.GetSealInfoById(sealInfo.SealId)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
//重新发起申请
|
|
|
err = CheckApply(sealInfo, opUser)
|
|
|
if err != nil {
|
