From 6f3e48f79f04989735054ef9903d86a74eae795b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 十二月 2024 10:17:12 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index f233a45..cd5b690 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -8,8 +8,10 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.TShop;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.TShopService;
import com.ruoyi.web.controller.tool.MsgUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +54,8 @@
private ISysRoleService roleService;
@Autowired
private ISysUserService userService;
+ @Autowired
+ private TShopService shopService;
@Autowired
private MsgUtils msgUtils;
@@ -118,6 +122,13 @@
if(roles.get(0).getStatus() == 1){
return AjaxResult.error("该账号角色已被禁用!");
}
+ if(loginUser.getRoleType() != 1){
+ // 查询店铺样式
+ TShop shop = shopService.getById(loginUser.getObjectId());
+ if(Objects.nonNull(shop)){
+ loginUser.setShopStyle(shop.getShopStyle());
+ }
+ }
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
@@ -151,6 +162,14 @@
return AjaxResult.error("该账号角色已被禁用!");
}
+ if(loginUser.getRoleType() != 1){
+ // 查询店铺样式
+ TShop shop = shopService.getById(loginUser.getObjectId());
+ if(Objects.nonNull(shop)){
+ loginUser.setShopStyle(shop.getShopStyle());
+ }
+ }
+
List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());
map.put("menus",menus);
--
Gitblit v1.7.1