From d88a0a8d9d8cd11cea0f7c7df17fcaa01da85510 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 十二月 2025 18:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 17 +++++++++++++++++
1 files changed, 17 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 6104db8..fffd343 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
@@ -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);
--
Gitblit v1.7.1