diff --git a/jnpf-app/pages/index/home.vue b/jnpf-app/pages/index/home.vue index 1419b589..49f1aa98 100644 --- a/jnpf-app/pages/index/home.vue +++ b/jnpf-app/pages/index/home.vue @@ -128,7 +128,6 @@ }; }, onLoad() { - debugger uni.$on("updateUsualList", (data) => { this.getUsualList(); }); diff --git a/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-biz/src/main/java/jnpf/portal/service/impl/PortalDataServiceImpl.java b/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-biz/src/main/java/jnpf/portal/service/impl/PortalDataServiceImpl.java index b5870300..09c313be 100644 --- a/jnpf-java-boot/jnpf-visualdev/jnpf-visualdev-portal/jnpf-visualdev-portal-biz/src/main/java/jnpf/portal/service/impl/PortalDataServiceImpl.java +++ b/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 map = JSONObject.parseObject(userEntity.getPortalId()).getInnerMap(); - portalId = map.get(platform + ":" + systemId).toString(); - }catch (Exception ignore){} - PortalEntity mainPortal = portalService.getById(portalId); - // 校验门户有效性 - if(mainPortal != null && mainPortal.getEnabledMark().equals(1)){ - // 管理员直接设置默认主页 - List authPortalIds; - if(userProvider.get().getIsAdministrator()){ - List currentVoList = portalManageApi.getListByEnable(new PortalManagePrimary(platform, null, systemId)); - authPortalIds = currentVoList.stream().map(PortalManageVO::getPortalId).collect(Collectors.toList()); - }else { - // 获取当前用户的所有权限的门户ID集合 - authPortalIds = getCurrentAuthPortalIds(new PortalViewPrimary(platform, null)); - } - if(CollectionUtil.isNotEmpty(authPortalIds) && authPortalIds.contains(portalId)) { - return portalId; - } - } - // 重新设置默认门户 - String updatePortalId = portalService.getModListFirstId(new PortalViewPrimary(platform, null)); - setCurrentDefault(platform, updatePortalId); - return updatePortalId; +// UserEntity userEntity = userService.getInfo(userProvider.get().getUserId()); +// String systemId = PortalConst.WEB.equals(platform) ? userProvider.get().getSystemId() : userProvider.get().getAppSystemId(); +// String portalId = ""; +// try{ +// Map map = JSONObject.parseObject(userEntity.getPortalId()).getInnerMap(); +// portalId = map.get(platform + ":" + systemId).toString(); +// }catch (Exception ignore){} +// PortalEntity mainPortal = portalService.getById(portalId); +// // 校验门户有效性 +// if(mainPortal != null && mainPortal.getEnabledMark().equals(1)){ +// // 管理员直接设置默认主页 +// List authPortalIds; +// if(userProvider.get().getIsAdministrator()){ +// List currentVoList = portalManageApi.getListByEnable(new PortalManagePrimary(platform, null, systemId)); +// authPortalIds = currentVoList.stream().map(PortalManageVO::getPortalId).collect(Collectors.toList()); +// }else { +// // 获取当前用户的所有权限的门户ID集合 +// authPortalIds = getCurrentAuthPortalIds(new PortalViewPrimary(platform, null)); +// } +// if(CollectionUtil.isNotEmpty(authPortalIds) && authPortalIds.contains(portalId)) { +// return portalId; +// } +// } +// // 重新设置默认门户 +// String updatePortalId = portalService.getModListFirstId(new PortalViewPrimary(platform, null)); +// setCurrentDefault(platform, updatePortalId); + return "419836445813935877"; } /**