From d8b6851836a7bbfcc15db478744453782cc0e27f Mon Sep 17 00:00:00 2001 From: lihang <lihang@vci-tech.com> Date: 星期三, 02 八月 2023 16:26:43 +0800 Subject: [PATCH] 主题库分类,父节点连带子节点发布失效修正 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 0edd622..e569cfb 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 @@ -2359,7 +2359,7 @@ // conditionMap.put(CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY) conditionMap.put("t." + CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + - btmTypeClient.selectByIdCollection(Collections.singletonList(MdmBtmTypeConstant.CODE_CLASSIFY)) + btmTypeClient.selectByIdCollection(Collections.singletonList("classify")) .getData().get(0).getTableName() + " where lcstatus='" + FrameWorkDefaultValueConstant .FRAMEWORK_DATA_ENABLED + "' start with parentCodeClassifyOid = '" + codeClassifyOid + "' CONNECT BY PRIOR OID = parentCodeClassifyOid )"); @@ -3355,13 +3355,17 @@ setter.invoke(obj, ((BigDecimal) map.get(property.getName().toUpperCase())).intValue()); map.remove(property.getName().toUpperCase()); } else if (map.get(property.getName().toUpperCase()) != null) { - setter.invoke(obj, map.get(property.getName().toUpperCase())); + if(setter.getParameterTypes()[0].getSimpleName().equals("String")){ + setter.invoke(obj, String.valueOf(map.get(property.getName().toUpperCase()))); + }else{ + setter.invoke(obj, map.get(property.getName().toUpperCase())); + } map.remove(property.getName().toUpperCase()); } } } for (Object key : map.keySet()) { - map.put(key, String.valueOf(map.get(key))); + map.put(key, map.get(key) == null ? null : String.valueOf(map.get(key))); } ((BaseModel) obj).setData(map); -- Gitblit v1.9.3