From 513367710d734076751e3fb5fa6bae429ec12714 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 3 Nov 2023 09:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/SystemUserAuthController.java          | 16 ++++++++--------
 .../service/impl/BaseMenuServiceImpl.java        | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
index 1b83a7b..2031895 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java
@@ -234,14 +234,14 @@ public class SystemUserAuthController {
 				return result;
 			}
 			String userId = decrypt.getString("uid");
-			String account = "";
-			if (userId.equals("myy")) {
-				account = "hzxmgl";
-			} else if (userId.equals("test")) {
-				account = "hzxm";
-			} else {
-				account = userId;
-			}
+			String account = userId;
+//			if (userId.equals("myy")) {
+//				account = "hzxmgl";
+//			} else if (userId.equals("test")) {
+//				account = "hzxm";
+//			} else {
+//				account = userId;
+//			}
 			SystemUser user = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery()
 					.eq(SystemUser::getAccount, account));
 			SystemUserAuthDto userInfo = new SystemUserAuthDto();
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
index 4859882..e730900 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java
@@ -154,18 +154,18 @@ public class BaseMenuServiceImpl extends ServiceImpl<BaseMenuMapper, BaseMenu> i
     public List<MenuHzDto> getAllForHz(Map<String, Object> map) {
         String userId = MapUtils.getString(map, "userId");
         userId = Aes.decrypt(userId, "ssologin66!@#$%^");
-        SystemUser systemUser = new SystemUser();
         Long moduleId = 0L;
-        if (userId.equals("myy")) {
-            systemUser = systemUserMapper.selectOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getAccount, "hzxmgl"));
-            moduleId = 1670639811581595650L;
-        } else {
-            systemUser = systemUserMapper.selectOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getAccount, userId));
-            moduleId = 1681837103227502594L;
-        }
+        SystemUser systemUser = systemUserMapper.selectOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getAccount, userId));
         if (systemUser == null) {
             throw new CustomException("用户不存在");
         }
+        if (systemUser.getAccountType() == 2) {
+            moduleId = 1670639811581595650L;
+        } else if (systemUser.getAccountType() == 3) {
+            moduleId = 1681837103227502594L;
+        } else {
+            moduleId = 1670603312504918018L;
+        }
         List<BaseMenu> baseMenus = new ArrayList<>();
         if (systemUser.getIsManager() && systemUser.getAccountType() != 3) {
             // 查询相对应的菜单