修改问题
This commit is contained in:
@@ -328,7 +328,7 @@ public class SsoService {
|
|||||||
if (StringUtils.isNotEmpty(personCardNo)) {
|
if (StringUtils.isNotEmpty(personCardNo)) {
|
||||||
sysUser = sysUserService.selectUserByIdCard(personCardNo);
|
sysUser = sysUserService.selectUserByIdCard(personCardNo);
|
||||||
} else {
|
} else {
|
||||||
sysUser = sysUserService.selectSysUserById(userJson.getLong("userId"));
|
sysUser = sysUserService.selectUserById(userJson.getLong("userId"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sysUser == null) {
|
if (sysUser == null) {
|
||||||
|
|||||||
@@ -137,11 +137,4 @@ public interface SysUserMapper
|
|||||||
*/
|
*/
|
||||||
SysUser selectUserByIdCard(String idCard);
|
SysUser selectUserByIdCard(String idCard);
|
||||||
|
|
||||||
/**
|
|
||||||
* 通过用户ID查询用户
|
|
||||||
*
|
|
||||||
* @param userId 用户ID
|
|
||||||
* @return 用户对象信息
|
|
||||||
*/
|
|
||||||
public SysUser selectSysUserById(Long userId);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -560,8 +560,4 @@ public class SysUserServiceImpl implements ISysUserService
|
|||||||
return userMapper.selectUserByIdCard(idCard);
|
return userMapper.selectUserByIdCard(idCard);
|
||||||
}
|
}
|
||||||
|
|
||||||
public SysUser selectSysUserById(Long userId){
|
|
||||||
return userMapper.selectSysUserById(userId);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -240,9 +240,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1
|
select * from sys_user where del_flag='0' and id_card = #{idCard} LIMIT 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectSysUserById" parameterType="Long" resultType="com.ruoyi.common.core.domain.entity.SysUser">
|
|
||||||
<include refid="selectUserVo"/>
|
|
||||||
where u.user_id = #{userId}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
Reference in New Issue
Block a user