BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：登录接口返回档口名称；

pull/1121/head
liujiang 2025-08-08 23:23:03 +08:00
parent 0c011d2cdd
commit aae048ca57
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,14 @@ import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.web.controller.system.vo.*; import com.ruoyi.web.controller.system.vo.*;
import com.ruoyi.xkt.domain.Store;
import com.ruoyi.xkt.manager.TencentAuthManager; import com.ruoyi.xkt.manager.TencentAuthManager;
import com.ruoyi.xkt.mapper.StoreMapper;
import com.ruoyi.xkt.service.IStoreService; import com.ruoyi.xkt.service.IStoreService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -65,6 +68,8 @@ public class SysLoginController {
private TencentAuthManager tencentAuthManager; private TencentAuthManager tencentAuthManager;
@Autowired @Autowired
private SysPasswordService passwordService; private SysPasswordService passwordService;
@Autowired
private StoreMapper storeMapper;
/** /**
* 登录方法 * 登录方法
@ -318,8 +323,10 @@ public class SysLoginController {
Long storeId = roleInfoVO.getRelStoreId(); Long storeId = roleInfoVO.getRelStoreId();
vo.setCurrentStoreId(storeId); vo.setCurrentStoreId(storeId);
if (storeId != null) { if (storeId != null) {
Store store = this.storeMapper.selectById(storeId);
vo.setCurrentStoreName(ObjectUtils.isNotEmpty(store) ? store.getStoreName() : "");
//档口状态 //档口状态
vo.setCurrentStoreStatus(storeService.getStoreStatus(storeId)); vo.setCurrentStoreStatus(ObjectUtils.isNotEmpty(store) ? store.getStoreStatus() : null);
} }
} }
} }

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/UserLoginInfoVO.java
View File

@ -28,6 +28,9 @@ public class UserLoginInfoVO extends UserInfoVO {
@ApiModelProperty("当前档口ID") @ApiModelProperty("当前档口ID")
private Long currentStoreId; private Long currentStoreId;
@ApiModelProperty("当前档口名称")
private String currentStoreName;
@ApiModelProperty("当前档口状态[1:待审核 2:审核驳回 3:试用期 4:正式使用 5:强制清退 null:未认证]") @ApiModelProperty("当前档口状态[1:待审核 2:审核驳回 3:试用期 4:正式使用 5:强制清退 null:未认证]")
private Integer currentStoreStatus; private Integer currentStoreStatus;