bug修改

xuhy

2025-12-09 4cb4eba2d43f732907e4ccd73c43fca919bb5d6d

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -4,11 +4,14 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.entity.SysRole;
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.model.TCrmBranch;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.TCrmBranchService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,8 @@
    private TokenService tokenService;
    @Autowired
    private ISysRoleService roleService;
    @Autowired
    private TCrmBranchService crmBranchService;

    /**
     * 账号密码登录
@@ -72,6 +77,18 @@
            return AjaxResult.error("该账号角色已被禁用!");
        }

        SysUser user = loginUser.getUser();
        Integer roleType = user.getRoleType();
        if(roleType == 2){
            // 查询分公司的类型
            TCrmBranch crmBranch = crmBranchService.getOne(Wrappers.lambdaQuery(TCrmBranch.class)
                    .eq(TCrmBranch::getUserId, loginUser.getUserId())
                    .eq(TCrmBranch::getStatus, 1)
                    .last("LIMIT 1"));
            user.setPersonType(crmBranch.getPersonType());
            loginUser.setUser(user);
        }

        List<SysMenu> menus = roleService.roleInfoFromUserId(loginUser.getUserId());

        ajax.put("menus",menus);