From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
index ffb5228..5c6b9c5 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
@@ -44,9 +44,9 @@
@Autowired
private TargetMngRepository targetMngRepository;
-
-
-
+
+
+
@Override
public ResultVO queryAll(PageQuery<TargetDivideDetailQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -88,7 +88,7 @@
//保存主数据
//如果目标指标已经被分解，那么就不能再次增加
- if(targetMng.getDivideStatus() == 1){
+ if(targetMng.getDivideStatus() == 1 && infoDto.getTargetId() == null){
throw new TargetDutyException(TargetDutyResultCodes.E2);
}
@@ -102,4 +102,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2