From a53ab71161c5a546c70fa22ec5530cc4b2c7a672 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 03 十二月 2024 17:12:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
similarity index 92%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
index cc29913..9c9ade2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/OsCodeRuleDaoImpl.java
@@ -1,14 +1,14 @@
package com.vci.web.dao.impl;
import com.vci.corba.omd.data.BusinessObject;
+import com.vci.model.OsCodeRuleDO;
+import com.vci.pagemodel.BatchCBO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.dao.OsCodeRuleDaoI;
-import com.vci.model.OsCodeRuleDO;
-import com.vci.pagemodel.BatchCBO;
-import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.WebBoServiceI;
+import com.vci.web.service.WebLifeCycleServiceI;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -40,7 +40,7 @@
* 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
*/
@Autowired
- private OsLifeCycleServiceI lifeCycleService;
+ private WebLifeCycleServiceI lifeCycleService;
/**
* 浣跨敤涓婚敭鍒犻櫎
@@ -168,7 +168,11 @@
if(CollectionUtils.isEmpty(cbos)){
return 0;
}
- lifeCycleService.transCboStatus(cbos,lcStatus);
+ try {
+ lifeCycleService.transCboStatus(cbos,lcStatus);
+ } catch (Exception e) {
+ throw new VciBaseException("鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬侊紒", new Object[]{}, e);
+ }
return cbos.size();
}
@@ -184,7 +188,11 @@
if(cbo == null || StringUtils.isBlank(cbo.oid)){
return 0;
}
- lifeCycleService.transStatus(cbo,lcStatus);
+ try {
+ lifeCycleService.transStatus(cbo,lcStatus);
+ } catch (Exception e) {
+ throw new VciBaseException("淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬佸け璐ワ紒", new Object[]{}, e);
+ }
return 1;
}
--
Gitblit v1.9.3