mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-11-04 10:57:10 +08:00 
			
		
		
		
	修复:修复在线用户缺失昵称信息的问题
This commit is contained in:
		@@ -35,6 +35,12 @@ public class OnlineUserVO implements Serializable {
 | 
			
		||||
 | 
			
		||||
    private static final long serialVersionUID = 1L;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * ID
 | 
			
		||||
     */
 | 
			
		||||
    @Schema(description = "ID")
 | 
			
		||||
    private Long id;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 令牌
 | 
			
		||||
     */
 | 
			
		||||
 
 | 
			
		||||
@@ -54,7 +54,9 @@ public class OnlineUserServiceImpl implements OnlineUserService {
 | 
			
		||||
    public PageDataVO<OnlineUserVO> page(OnlineUserQuery query, PageQuery pageQuery) {
 | 
			
		||||
        List<LoginUser> loginUserList = this.list(query);
 | 
			
		||||
        List<OnlineUserVO> list = BeanUtil.copyToList(loginUserList, OnlineUserVO.class);
 | 
			
		||||
        return PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), list);
 | 
			
		||||
        PageDataVO<OnlineUserVO> pageDataVO = PageDataVO.build(pageQuery.getPage(), pageQuery.getSize(), list);
 | 
			
		||||
        pageDataVO.getList().forEach(u -> u.setNickname(LoginHelper.getNickname(u.getId())));
 | 
			
		||||
        return pageDataVO;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
 
 | 
			
		||||
@@ -9,9 +9,15 @@ export default function usePermission() {
 | 
			
		||||
        !route.meta?.requiresAuth ||
 | 
			
		||||
        !route.meta?.roles ||
 | 
			
		||||
        route.meta?.roles?.includes('*') ||
 | 
			
		||||
        route.meta?.roles?.includes(loginStore.roles[0])
 | 
			
		||||
        this.includeRole(route.meta?.roles, loginStore.roles)
 | 
			
		||||
      );
 | 
			
		||||
    },
 | 
			
		||||
    includeRole(arr1: Array<string>, arr2: Array<string>) {
 | 
			
		||||
      const temp = arr1.filter((item) => {
 | 
			
		||||
        return arr2.includes(item);
 | 
			
		||||
      });
 | 
			
		||||
      return !!temp.length;
 | 
			
		||||
    },
 | 
			
		||||
    findFirstPermissionRoute(_routers: any, role = 'admin') {
 | 
			
		||||
      const cloneRouters = [..._routers];
 | 
			
		||||
      while (cloneRouters.length) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user