From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
index ad68b9a..0e404b2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
@@ -43,16 +43,23 @@
public void add(AddSgProjectPersonConfigDTO dto) {
for (SgProjectPersonConfigDO sgProjectPersonConfigDO : dto.getData()) {
Long id = sgProjectPersonConfigDO.getId();
+ Long userId = sgProjectPersonConfigDO.getUserId();
if (Objects.isNull(id)){
projectPersonConfigMapper.insert(sgProjectPersonConfigDO);
}else {
SgProjectPersonConfigDO old = projectPersonConfigMapper.selectById(id);
- if (old.getUserId()!=sgProjectPersonConfigDO.getUserId()){
- if (!new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId,old.getProgramId()).list().isEmpty()){
- throw new ServiceException("此项目配置存在审批，不允许修改");
+ boolean isReport = !new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId, old.getProgramId()).list().isEmpty();
+ if (Objects.isNull(userId)){
+ if (isReport){
+ throw new ServiceException("此项目配置存在审批，不允许修改");
+ }
+ projectPersonConfigMapper.deleteById(id);
+ }else if (!old.getUserId().equals(sgProjectPersonConfigDO.getUserId())){
+ if (isReport){
+ throw new ServiceException("此项目配置存在审批，不允许修改");
+ }
+ projectPersonConfigMapper.updateById(sgProjectPersonConfigDO);
}
- }
- projectPersonConfigMapper.updateById(sgProjectPersonConfigDO);
}
}
}
--
Gitblit v1.9.3