From 5dd6f4aa2123671e95907ee19f5925a98983cdc8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 三月 2024 10:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e7e6129..0c37fdb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -462,7 +462,7 @@
if(isUsedFlag){
AtomicBoolean success= new AtomicBoolean(true);
List<PersonMasterData> masterDataList=new ArrayList<>();
- List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+ List<String> fields = Func.toStrList(personAndDeptConfig.getPersonFields());
try {
if(personData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
@@ -668,6 +668,7 @@
} catch (Exception e) {
mesg=e.getMessage();
e.printStackTrace();
+ throw new ServiceException(e.getMessage());
}finally {
XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
x.setId(rowData.getOid());
@@ -694,7 +695,8 @@
}
}catch (Throwable e){
success.set(false);
- message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ message = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ msg = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -743,7 +745,7 @@
String systemCode="";
if(isUsedFlag){
List<OrgMasterData> orgMasterDataList=new ArrayList<>();
- List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getDeptFields());
+ List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
try {
if(orgData==null){
throw new Throwable("浼犲叆鍙傛暟涓簄ull");
@@ -944,8 +946,8 @@
}
} catch (Exception e) {
mesg=e.getMessage();
- e.getMessage();
e.printStackTrace();
+ throw new ServiceException(e.getMessage());
}finally {
XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
x.setId(rowData.getOid());
@@ -972,7 +974,8 @@
}
}catch (Throwable e){
success.set(false);
- message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+ message = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+ msg = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
//缁勭粐杩斿洖缁撴灉
boolean finalSuccess = success.get();
String finalMessage = message;
@@ -2723,7 +2726,7 @@
dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
}
dockingLogeService.save(dockingLoge);
- log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+ log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
}
/***
--
Gitblit v1.9.3