From 5abd278b2f0a896e97532a99cef735cee9593565 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 29 八月 2023 19:21:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java index f4b2874..17b4f7c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java @@ -2327,6 +2327,7 @@ sb.append(" select * from "); sb.append(tableName); sb.append(" where 1=1 "); + sb.append(" and lastr=1 and lastv=1" ); if(isCodeOrGroupCode) { sb.append(" and groupcode in ("); }else{ @@ -4021,7 +4022,7 @@ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject); for (String key:dataMap.keySet()){ Object value= dataMap.getOrDefault(key,""); - clientBusinessObject.setAttributeValue(key,value==null?"":value.toString()); + clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString()); } clientBusinessObjectList.add(clientBusinessObject); }); -- Gitblit v1.9.3