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 20b11f5..b46d3eb 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 @@ -89,7 +89,7 @@ public class SysLoginController { // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid()); - SysUser user = sysUserMapper.selectDeptIdByUserName(loginBody.getUsername()); + SysUser user = sysUserMapper.selectDeptIdByStudentNumber(loginBody.getUsername()); ajax.put(Constants.TOKEN, token); ajax.put("deptId",user.getDeptId()); ajax.put("UserId",user.getUserId()); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java index c8b1c7b..23ea09c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.framework.web.service; +import com.ruoyi.system.mapper.SysUserMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,10 +31,13 @@ public class UserDetailsServiceImpl implements UserDetailsService @Autowired private SysPermissionService permissionService; + @Autowired + private SysUserMapper sysUserMapper; + @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - SysUser user = userService.selectUserByUserName(username); + SysUser user = sysUserMapper.selectUserByStudentNumber(username); if (StringUtils.isNull(user)) { log.info("登录用户:{} 不存在.", username); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 53ddfaa..5c80710 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -150,4 +150,6 @@ public interface SysUserMapper Long selectUserIDByStuNum(@Param("studentNumber") String studentNumber); SysUser selectDeptIdByUserName(@Param("userName")String username); + + SysUser selectDeptIdByStudentNumber(@Param("userName")String username); } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 04bd757..3325130 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -151,6 +151,12 @@ WHERE su.user_name = #{userName} + +