From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
rename to Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
index dad510b..b797540 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/util/WebUtil.java
@@ -78,10 +78,9 @@
return errContent;
}
if (e instanceof PLException ) {
-// String error_code = ((VCIError) e).error_code;
-// String[] error_message = ((VCIError) e).error_message;
-// return MessageUtils.get(error_code, error_message);
- return null;
+ String error_code = ((PLException) e).code;
+ String[] error_message = ((PLException) e).messages;
+ return MessageUtils.get(error_code, error_message);
} else if(e instanceof VciBaseException || e.getClass().getSuperclass().equals(VciBaseException.class)){
return LangBaseUtil.getErrorMsg(e);
}else if (e instanceof VciException){
@@ -1266,24 +1265,24 @@
* @param lo 閾炬帴绫诲瀷
* @param map map
*/
- public static void copyValueToMapFromLos(com.vci.corba.omd.data.LinkObject lo,Map<String,String> map){
+ public static void copyValueToMapFromLos(LinkObject lo,Map<String,String> map){
if(lo!=null){
- WebLoServiceImpl.LO_BASE_FIELD_MAP.forEach((field,attr)->{
+ WebLoServiceImpl.LO_BASE_FIELD_MAP.forEach((field, attr)->{
map.put(attr.toLowerCase(),getValueFromFieldForCbo(getFieldForObject(field,lo),lo));
});
//鍏堟妸鎵�鏈夌殑瀛楁鏄犲皠鎵惧埌
- com.vci.corba.omd.data.AttributeValue[] newAList = lo.newAttrValList;
- com.vci.corba.omd.data.AttributeValue[] hisAList = lo.hisAttrValList;
+ AttributeValue[] newAList = lo.newAttrValList;
+ AttributeValue[] hisAList = lo.hisAttrValList;
if(hisAList!=null&&hisAList.length>0){
for(int i = 0 ; i < hisAList.length;i++){
- com.vci.corba.omd.data.AttributeValue av = hisAList[i];
+ AttributeValue av = hisAList[i];
String attrName = av.attrName.toLowerCase();
map.put(attrName, av.attrVal);
}
}
if(newAList!=null&&newAList.length>0){
for(int i = 0 ; i < newAList.length;i++){
- com.vci.corba.omd.data.AttributeValue av = newAList[i];
+ AttributeValue av = newAList[i];
String attrName = av.attrName.toLowerCase();
map.put(attrName, av.attrVal);
}
@@ -1494,19 +1493,8 @@
* @param e 寮傚父瀵硅薄
* @return base寮傚父瀵硅薄
*/
-// public static VciBaseException getVciBaseException(PLException e){
-//// return new VciBaseException(e.error_code, e.error_message);
-// return null;
-// }
-
- /**
- * 杞崲寮傚父
- * @param e 寮傚父瀵硅薄
- * @return base寮傚父瀵硅薄
- */
public static VciBaseException getVciBaseException(PLException e){
return new VciBaseException(e.code, new java.lang.String[]{e.getMessage()});
-// return null;
}
/**
--
Gitblit v1.9.3