From a9ef002fbfe2207071d604f55b36bbb74204a7a0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 九月 2023 14:33:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 19fb609..721683a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -560,7 +560,9 @@
} else {
//璇存槑鏄嚜琛岄厤缃殑
//鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
+ String orDefault = orderDTO.getData().getOrDefault(attrId, "");
+ value = Func.isBlank(orDefault) ? orderDTO.getData()
+ .getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault;
}
return value;
}
@@ -949,7 +951,7 @@
return (BaseModel) valueWrapper.get();
} catch (Exception e) {
logger.error("鍒涘缓涓氬姟绫诲瀷瀵硅薄", e);
- throw new VciBaseException("initBtmError", new String[]{btmName});
+ throw new ServiceException("initBtmError:"+"涓氬姟绫诲瀷锛�"+btmName+":"+e.getMessage());
}
}
@@ -1327,6 +1329,7 @@
}
fieldVO.setOptionJsMap(eventJsMap);
fieldVO.setStyle(attrVO.getTableDisplayStyle());
+ fieldVO.setTableDisplayFlag(attrVO.getTableDisplayFlag());
//鍒楄〃閲屼笉鍏佽鐩存帴缂栬緫
fieldVO.setDateFormate(attrVO.getCodeDateFormat());
return fieldVO;
--
Gitblit v1.9.3