From 65088015a5670f4973ce303f6e39b3a2330cca41 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 08 九月 2023 14:58:23 +0800
Subject: [PATCH] 人员组织结构申请接口开发

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..8b89e4e 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;
     }
@@ -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