fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/system/SysLoginController.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.controller.system;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zhongzheng.common.constant.Constants;
@@ -14,6 +15,7 @@ import com.zhongzheng.framework.web.service.SysPermissionService;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.modules.system.service.ISysMenuService;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.system.vo.SysTenantVo;
 import com.zhongzheng.modules.user.bo.UserBusinessLoginBo;
 import io.swagger.annotations.Api;
@@ -53,7 +55,8 @@ public class SysLoginController
 
     @Autowired
     private ISysTenantService iSysTenantService;
-
+    @Autowired
+    private ISysUserService iSysUserService;
     /**
      * 登录方法
      *
@@ -99,7 +102,8 @@ public class SysLoginController
     public AjaxResult getInfo()
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        SysUser user = loginUser.getUser();
+        SysUser user = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUserId, loginUser.getUser().getUserId()).last("limit 1"));
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserServiceImpl.java

@@ -248,14 +248,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     public int updateUser(SysUser user) {
         validEntityBeforeSave(user);
-        // 新增用户与角色管理
-        if (!user.getStatus().equals(-1)) {
-            insertUserRole(user);
-        }
-        // 新增用户与岗位管理
-        if (!user.getStatus().equals(-1)) {
-            insertUserPost(user);
+        if(Validator.isNotEmpty(user.getStatus())){
+            // 新增用户与角色管理
+            if (!user.getStatus().equals(-1)) {
+                insertUserRole(user);
+            }
+            // 新增用户与岗位管理
+            if (!user.getStatus().equals(-1)) {
+                insertUserPost(user);
+            }
         }
+        user.setUpdateTime(DateUtils.getNowDate());
         return baseMapper.updateById(user);
     }