Browse Source

登录问题处理

master
lihuangbin666 4 days ago
parent
commit
a59eb8d5d5
  1. 2
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java
  2. 5
      application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java

2
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/controller/LoginController.java

@ -1472,7 +1472,7 @@ public class LoginController {
List<SysMenuPerm> onlineMenuPermList = allMenuPermList.stream() List<SysMenuPerm> onlineMenuPermList = allMenuPermList.stream()
.filter(m -> m.getOnlineFormId() != null .filter(m -> m.getOnlineFormId() != null
// && m.getOnlineFlowEntryId() == null // && m.getOnlineFlowEntryId() == null
&& m.getMenuType().equals(SysMenuType.TYPE_MENU)) && (m.getMenuType().equals(SysMenuType.TYPE_MENU) || m.getMenuType().equals(SysMenuType.TYPE_PERM_MENU)))
.collect(Collectors.toList()); .collect(Collectors.toList());
Map<Long, List<SysMenuPerm>> onlineMenuPermMap = Map<Long, List<SysMenuPerm>> onlineMenuPermMap =
onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId)); onlineMenuPermList.stream().collect(Collectors.groupingBy(SysMenuPerm::getOnlineFormId));

5
application-tenant/tenant-admin/src/main/java/apelet/tenantadmin/upms/model/constant/SysMenuType.java

@ -27,6 +27,10 @@ public final class SysMenuType {
* 按钮类型 * 按钮类型
*/ */
public static final int TYPE_BUTTON = 3; public static final int TYPE_BUTTON = 3;
/**
* 权限表单
*/
public static final int TYPE_PERM_MENU = 4;
private static final Map<Object, String> DICT_MAP = new HashMap<>(4); private static final Map<Object, String> DICT_MAP = new HashMap<>(4);
static { static {
@ -34,6 +38,7 @@ public final class SysMenuType {
DICT_MAP.put(TYPE_MENU, "普通菜单"); DICT_MAP.put(TYPE_MENU, "普通菜单");
DICT_MAP.put(TYPE_UI_FRAGMENT, "表单片段类型"); DICT_MAP.put(TYPE_UI_FRAGMENT, "表单片段类型");
DICT_MAP.put(TYPE_BUTTON, "按钮类型"); DICT_MAP.put(TYPE_BUTTON, "按钮类型");
DICT_MAP.put(TYPE_PERM_MENU, "权限菜单");
} }
/** /**

Loading…
Cancel
Save