Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -21,6 +21,7 @@ import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.bo.*;
 import com.qs.serve.modules.sys.entity.dto.*;
+import com.qs.serve.modules.sys.mapper.SysMenuMapper;
 import com.qs.serve.modules.sys.service.*;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.wx.entity.WxUser;
@@ -53,6 +54,7 @@ public class SysUserController {
     private SysRoleService sysRoleService;
     private WxUserService wxUserService;
     private SysUserSalesService sysUserSalesService;
+    private final SysMenuMapper sysMenuMapper;
 
     /**
      * 检查是否默认密码
@@ -134,11 +136,18 @@ public class SysUserController {
     public R<SysUserVo> info(){
         LoginUser loginUser = AuthContextUtils.getLoginUser();
         SysUser sysUser = sysUserService.getById(loginUser.getUserId());
-        sysUser.setAuthorIds(loginUser.getAuthorIds());
         sysUser.setAuthorList(loginUser.getAuthorList());
         SysUserVo sysUserVo = sysUser.toSysUserVo(false);
         SysDept dept = sysDeptService.getById(sysUser.getDeptId());
         sysUserVo.setDeptInfo(dept);
+        //解决H5页面权限不刷新
+        List<SysRole> defaultRole = sysRoleService.getDefaultRole();
+        List<String> defaultRoleIds = defaultRole.stream().map(SysRole::getId).collect(Collectors.toList());
+        List<String> menuIds = sysMenuMapper.searchUserMenuIds(sysUser.getId());
+        List<String> defaultRoleMenuIds = sysMenuMapper.searchDefaultMenuIds(defaultRoleIds);
+        menuIds.addAll(defaultRoleMenuIds);
+        sysUser.setAuthorIds(menuIds);
+
         //SysPost sysPost = sysPostService.getById(sysUser.getPositionId());
         //sysUserVo.setPostInfo(sysPost);
         return R.ok(sysUserVo);