1.修改bug

mitao

2024-06-20 cd55aff7eea06f77a8f712cef1ad2744c44d0f8a

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -26,6 +26,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
@@ -90,19 +91,22 @@
    {
        // 用户登录
        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
        SysUser sysUser1 = userInfo.getSysUser();
        HashMap<String, Object> map = new HashMap<>();
        map.put("token",tokenService.createToken(userInfo));
        List<SysRole> roles = userInfo.getSysUser().getRoles();
        if(CollectionUtils.isEmpty(roles)){
            return R.fail("请关联角色!");
        List<SysRole> roles = sysUser1.getRoles();
        if (Objects.equals("00", sysUser1.getUserType())) {
            if (CollectionUtils.isEmpty(roles)) {
                return R.fail("请关联角色!");
            }
            map.put("roleName", roles.get(0).getRoleName());
        }

        map.put("roleName",roles.get(0).getRoleName());
        map.put("info",userInfo);
        map.put("userType", userInfo.getSysUser().getUserType());
        map.put("userType", sysUser1.getUserType());
        // 修改用户最后登录时间
        SysUser sysUser = new SysUser();
        sysUser.setUserId(userInfo.getSysUser().getUserId());
        sysUser.setUserId(sysUser1.getUserId());
        sysUser.setLoginDate(new Date());
        System.out.println("修改用户登录时间"+sysUser);
        userClient.updateSysUser(sysUser);