From 97cd53a574602b3eb4320a6e63105f604eb03f85 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 17 十二月 2025 09:02:12 +0800
Subject: [PATCH] 修改新增
---
multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java
index ff20781..8462e80 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/useSealApply/impl/UseSealApplyServiceImpl.java
@@ -6,6 +6,7 @@
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
+import com.gkhy.exam.common.utils.StringUtils;
import com.gkhy.exam.system.domain.UseSealApply;
import com.gkhy.exam.system.domain.UseSealApplyFile;
import com.gkhy.exam.system.domain.UseSealApplyFlow;
@@ -62,7 +63,7 @@
List<UseSealApplyFlow> flows = useSealApply.getFlows();
for (UseSealApplyFlow flow : flows) {
flow.setUseSealId(useSealApply.getId());
- if (flow.getApproveUserId().equals(useSealApply.getApplyUserId())){
+ if (flow.getApproveUserId().equals(useSealApply.getApplyUserId()) && flow.getFlowName().equals("申请人")){
flow.setStatus(2);
}else {
flow.setStatus(1);
@@ -124,6 +125,9 @@
if (useSealApplyFlow.getApproveStatus()==null){
return CommonResult.failed("审批意见不可为空");
}
+ if (StringUtils.isEmpty(useSealApplyFlow.getApproveMess())){
+ return CommonResult.failed("审批意见不可为空");
+ }
if (useSealApplyFlow.getApproveStatus()==1){
useSealApplyFlow.setApproveContent("同意");
}else {
@@ -153,6 +157,8 @@
List<UseSealApply> useSealApplies = useSealApplyMapper.selectUseApplyByUserId(userId);
for (UseSealApply sealApply : useSealApplies) {
List<UseSealApplyFlow> useSealApplyFlows = flowMapper.selectByUseSealId(sealApply.getId());
+ List<UseSealApplyFile> useSealApplyFiles = fileMapper.selectByUseSealId(sealApply.getId());
+ sealApply.setFiles(useSealApplyFiles);
sealApply.setFlows(useSealApplyFlows);
}
return CommonResult.success(useSealApplies);
--
Gitblit v1.9.2