APP

jnpf-app/pages/index/home.vue

@@ -128,7 +128,6 @@
 			};
 		},
 		onLoad() {
-			debugger
 			uni.$on("updateUsualList", (data) => {
 				this.getUsualList();
 			});

jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-biz/src/main/java/jnpf/portal/service/impl/PortalDataServiceImpl.java

@@ -272,33 +272,33 @@ public class PortalDataServiceImpl extends SuperServiceImpl<PortalDataMapper, Po
 
     @Override
     public String getCurrentDefault(String platform) throws Exception {
-        UserEntity userEntity = userService.getInfo(userProvider.get().getUserId());
+//        UserEntity userEntity = userService.getInfo(userProvider.get().getUserId());
-        String systemId = PortalConst.WEB.equals(platform) ? userProvider.get().getSystemId() : userProvider.get().getAppSystemId();
+//        String systemId = PortalConst.WEB.equals(platform) ? userProvider.get().getSystemId() : userProvider.get().getAppSystemId();
-        String portalId = "";
+//        String portalId = "";
-        try{
+//        try{
-            Map<String, Object> map = JSONObject.parseObject(userEntity.getPortalId()).getInnerMap();
+//            Map<String, Object> map = JSONObject.parseObject(userEntity.getPortalId()).getInnerMap();
-            portalId = map.get(platform + ":" + systemId).toString();
+//            portalId = map.get(platform + ":" + systemId).toString();
-        }catch (Exception ignore){}
+//        }catch (Exception ignore){}
-        PortalEntity mainPortal = portalService.getById(portalId);
+//        PortalEntity mainPortal = portalService.getById(portalId);
-        // 校验门户有效性
+//        // 校验门户有效性
-        if(mainPortal != null && mainPortal.getEnabledMark().equals(1)){
+//        if(mainPortal != null && mainPortal.getEnabledMark().equals(1)){
-            // 管理员直接设置默认主页
+//            // 管理员直接设置默认主页
-            List<String> authPortalIds;
+//            List<String> authPortalIds;
-            if(userProvider.get().getIsAdministrator()){
+//            if(userProvider.get().getIsAdministrator()){
-                List<PortalManageVO> currentVoList = portalManageApi.getListByEnable(new PortalManagePrimary(platform, null, systemId));
+//                List<PortalManageVO> currentVoList = portalManageApi.getListByEnable(new PortalManagePrimary(platform, null, systemId));
-                authPortalIds = currentVoList.stream().map(PortalManageVO::getPortalId).collect(Collectors.toList());
+//                authPortalIds = currentVoList.stream().map(PortalManageVO::getPortalId).collect(Collectors.toList());
-            }else {
+//            }else {
-                // 获取当前用户的所有权限的门户ID集合
+//                // 获取当前用户的所有权限的门户ID集合
-                authPortalIds = getCurrentAuthPortalIds(new PortalViewPrimary(platform, null));
+//                authPortalIds = getCurrentAuthPortalIds(new PortalViewPrimary(platform, null));
-            }
+//            }
-            if(CollectionUtil.isNotEmpty(authPortalIds) && authPortalIds.contains(portalId)) {
+//            if(CollectionUtil.isNotEmpty(authPortalIds) && authPortalIds.contains(portalId)) {
-                return portalId;
+//                return portalId;
-            }
+//            }
-        }
+//        }
-        // 重新设置默认门户
+//        // 重新设置默认门户
-        String updatePortalId = portalService.getModListFirstId(new PortalViewPrimary(platform, null));
+//        String updatePortalId = portalService.getModListFirstId(new PortalViewPrimary(platform, null));
-        setCurrentDefault(platform, updatePortalId);
+//        setCurrentDefault(platform, updatePortalId);
-        return updatePortalId;
+        return "419836445813935877";
     }
 
     /**