From 87e51a66bbad8eb287755c9ffa91e78345919f8b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 05 七月 2023 18:15:40 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
index f731a5d..62db19e 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
@@ -309,6 +309,7 @@
* @param lifeCycleDTO 鏁版嵁浼犺緭瀵硅薄
*/
@Override
+ @Transactional
public void delete(LifeCycleDTO lifeCycleDTO) {
VciBaseUtil.alertNotNull(lifeCycleDTO,"鏁版嵁浼犺緭瀵硅薄",lifeCycleDTO.getOid(),"涓婚敭");
LifeCycleRule rule = null;
@@ -320,8 +321,20 @@
//妫�鏌ヨ寮曠敤涓嶈兘鍒犻櫎
Integer count = btmTypeService.countByLifeId(lifeCycleDTO.getOid());
if(count !=null && count>0){
-
+ throw new VciBaseException("鐢熷懡鍛ㄦ湡琚娇鐢紝涓嶈兘琚垹闄�");
}
+ //鎴戜滑鏌ヨ鍏ㄩ儴node鍜宔dge锛岀劧鍚庝竴璧峰垹闄�
+
+ }
+
+
+ private List<LifeCycleNode> selectNodeByLifeOid(String lifeOid){
+ if(!StringUtils.hasLength(lifeOid)){
+ return new ArrayList<>();
+ }
+ LambdaQueryWrapper<LifeCycleNode> query = new LambdaQueryWrapper<LifeCycleNode>();
+ query.eq(LifeCycleNode::getLifeCycleOid,lifeOid);
+ return nodeMapper.selectList(query);
}
/**
--
Gitblit v1.9.3