From 61313c5dc05cf7d8be02d3e7cc8a3c89d1774b06 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 12 二月 2025 15:37:39 +0800
Subject: [PATCH] bug

---
 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