From ab54535ba1a6fff9ed7746cb8184b54005937691 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十二月 2024 15:28:40 +0800
Subject: [PATCH] 1、UI上下文查询接口,添加权限过滤逻辑。 2、密码策略查询对象的创建日期和修改日期属性修改为String类型。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index 9de09f6..4545527 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -13,6 +13,7 @@
 import com.vci.model.SmRoleForPlatform1;
 import com.vci.omd.utils.ObjectTool;
 import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.RoleRightVO;
 import com.vci.pagemodel.SmFunctionVO;
 import com.vci.pagemodel.UIContentVO;
 import com.vci.starter.web.constant.QueryOptionConstant;
@@ -24,6 +25,7 @@
 import com.vci.web.properties.JsonConfigReader;
 import com.vci.web.service.ISmFunctionQueryService;
 import com.vci.web.service.UIEngineServiceI;
+import com.vci.web.service.UIManagerServiceI;
 import com.vci.web.service.WebBoServiceI;
 import com.vci.starter.web.util.Lcm.Func;
 import com.vci.web.util.PlatformClientUtil;
@@ -87,13 +89,16 @@
 	private ISmFunctionQueryService self;
 
     @Autowired
-    private  UIEngineServiceI uiEngineServiceI;
+    private UIEngineServiceI uiEngineServiceI;
+
+    @Autowired
+    private UIManagerServiceI uiManagerServiceI;
+
+    @Autowired
+    private RightControlUtil rightControlUtil;
 
     @Autowired
     private PlatformClientUtil platformClientUtil;
-
-    @Autowired
-    RightControlUtil rightControlUtil;
 
     /**
      * 鏌ヨ鎵�鏈夌殑鍔熻兘
@@ -708,13 +713,14 @@
     @Override
     public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
         SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
-        if(resourceControlTypeEnum == null){
+        /* if(resourceControlTypeEnum == null){
             resourceControlTypeEnum = ResourceControlTypeEnum.BS;
-        }
+        }*/
+        Map<String, RoleRightVO> roleRightMap = uiManagerServiceI.getRoleRightMap(null);
         for (PLUILayout allPLUILayout : platformClientUtil.getUIService().getAllPLUILayouts()) {
             if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
                     && treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
-                return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
+                return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true,roleRightMap);
             }
         }
         return null;

--
Gitblit v1.9.3