修改代码

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageDataVO.java

 package com.github.wxiaoqi.security.common.vo;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.github.pagehelper.ISelect;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -48,4 +50,12 @@ public  class PageDataVO<T> {
     public static <M> PageDataVO<M> pageInfo(Query query, ISelect select){
         return PageDataVO.pageInfo(PageHelper.startPage(query.getPage(), query.getLimit()).doSelectPageInfo(select));
     }
+
+    public static <M> PageDataVO<M> pageInfo(Query query, ISelect select, Class classz){
+        PageDataVO<M> pageDataVo = pageInfo(query, select);
+        if(CollUtil.isNotEmpty(pageDataVo.getData()) && pageDataVo.getData().get(0).getClass() != classz) {
+            pageDataVo.setData(Convert.toList(classz, pageDataVo.getData()));
+        }
+        return pageDataVo;
+    }
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseUserVO.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import com.github.wxiaoqi.security.admin.entity.Group;
+import com.github.wxiaoqi.security.admin.entity.User;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaseUserVO extends User {
+
+    private List<Group> groupList;
+    private String groupStr;
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.entity.Menu;
 import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
+import com.github.wxiaoqi.security.admin.vo.BaseUserVO;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
 import com.github.wxiaoqi.security.admin.vo.GroupUsers;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
@@ -18,6 +19,7 @@ import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -147,14 +149,22 @@ public class UserController extends CommonBaseController {
 
     @RequestMapping(value = "/page",method = RequestMethod.GET)
     @ResponseBody
-    public TableResultResponse<User> list(@RequestParam Map<String, Object> params){
+    public ObjectRestResponse<PageDataVO<BaseUserVO>> list(@RequestParam Map<String, Object> params){
         //查询列表数据
         Query query = new Query(params);
         try {
-            return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
+            PageDataVO<BaseUserVO> dataVO= PageDataVO.pageInfo(query, ()-> userBiz.selectListAll(), BaseUserVO.class);
+            List<BaseUserVO> list=dataVO.getData();
+            if (list != null && list.size() > 0){
+                for (BaseUserVO baseUserVo:list){
+                    baseUserVo.setGroupList(groupBiz.getUserGroups(baseUserVo.getId()));
+                }
+            }
+            return  ObjectRestResponse.succ(dataVO);
+            //return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
         }catch (Exception e) {
             log.error(e.getMessage());
-            return new TableResultResponse<User>();
+            return ObjectRestResponse.createDefaultFail();
         }
     }