From b44b174f656aac1fe03e7f96851e564c3982f67d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 28 三月 2025 16:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java
index ba386c5..d184e4f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysLoginController.java
@@ -24,6 +24,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
/**
@@ -70,11 +71,15 @@
if (CollectionUtils.isEmpty(roles)) {
return AjaxResult.error("请关联角色!");
}
-
+ Optional<SysRole> any = roles.stream().filter(role -> role.getAppletFlag().equals(1)).findAny();
+ if (any.isPresent()) {
+ return AjaxResult.error("小程序用户不能登录管理后台!");
+ }
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
-
+ Set<Long> permissions = roleService.getMenuIdSets(loginUser.getUserId());
ajax.put("menus", menus);
ajax.put("userInfo", loginUser);
+ ajax.put("permissions", permissions);
return ajax;
}
--
Gitblit v1.7.1