From a60abbdf6b963cf52113eec518aaeef72a6c99f5 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 07 四月 2024 17:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 7543aad..4bfe77d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -1194,19 +1194,20 @@
if(StringUtils.isBlank(componentOid)){
return null;
}
-// if(!QUERY_BY_CACHE){
-// try {
-// return uiComponentDO2VO(platformClientUtil.getPortalService().getPLPageDefinationById(componentOid),true);
-// } catch (VCIError vciError) {
-// throw WebUtil.getVciBaseException(vciError);
-// }
-// }else{
-// List<UIComponentVO> componentVOS = self.selectAllUIComponent();
-// List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
-// if(!CollectionUtils.isEmpty(componentVOList)){
-// return componentVOList.get(0);
-// }
-// }
+ if(!QUERY_BY_CACHE){
+ try {
+ platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
+ return uiComponentDO2VO(null,true);
+ } catch (VCIError vciError) {
+ throw WebUtil.getVciBaseException(vciError);
+ }
+ }else{
+ List<UIComponentVO> componentVOS = self.selectAllUIComponent();
+ List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(componentVOList)){
+ return componentVOList.get(0);
+ }
+ }
return null;
}
--
Gitblit v1.9.3