修改

xuhy

2024-10-23 99145a616ec0c58a837b8831ee2cda459514bbe0

修改

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

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -63,6 +63,11 @@
    private String nickName;
    private Integer roleType;
    private Long objectId;
    /**
     * 店铺样式
     */

    private Integer shopStyle;

    /**
     * 权限列表
@@ -92,6 +97,14 @@
        this.permissions = permissions;
    }

    public Integer getShopStyle() {
        return shopStyle;
    }

    public void setShopStyle(Integer shopStyle) {
        this.shopStyle = shopStyle;
    }

    public Long getObjectId() {
        return objectId;
    }