From 8b65200711dffed1a41aaba61bf95d255f711549 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 17 十月 2023 11:17:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
index 8fd3b20..44f6615 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java
@@ -416,9 +416,10 @@
throw new VciBaseException("瑕佸垹闄ょ殑鐘舵�佸璞′笉鑳戒负绌�");
}
Set<String> oidSet= new HashSet<>();
+ Set<String> idSet= new HashSet<>();
statusVOList.stream().forEach( s -> {
VciBaseUtil.alertNotNull(s.getOid(),"瑕佸垹闄ょ殑鐘舵�佸璞＄殑涓婚敭");
- oidSet.add(s.getOid());
+ idSet.add(s.getId());
});
//鏌ヨ
List<Status> statusDOList = listStatusByOidCollectionDO(oidSet);
@@ -432,7 +433,7 @@
}
});
//妫�鏌ュ睘鎬ф槸鍚﹁寮曠敤
- if(checkStatusUseds(oidSet)){
+ if(checkStatusUseds(idSet)){
throw new VciBaseException("瑕佸垹闄ょ殑鐘舵�佸湪鐢熷懡鍛ㄦ湡瀵硅薄涓浣跨敤锛屾棤娉曞垹闄�");
}
Collection<Collection<String>> oidCollections = VciBaseUtil.switchCollectionForOracleIn(oidInDbSet);
@@ -449,6 +450,10 @@
*/
@Override
public boolean checkStatusUseds(Collection<String> oidCollection) {
+ Long count = lifeCycleNodeMapper.selectCount(Wrappers.<LifeCycleNode>query().lambda().in(LifeCycleNode::getId,oidCollection));
+ if(count>0){
+ return true;
+ }
return false;
}
@@ -461,6 +466,7 @@
*/
@Override
public boolean checkStatusUsed(String pkStatus) throws VciBaseException {
+
return false;
}
--
Gitblit v1.9.3