Merge branch 'master-tiande' into dev-tiande

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -192,6 +192,12 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
         Integer page=baseUserDTO.getPage()==null?1:baseUserDTO.getPage();
         Integer limit=baseUserDTO.getLimit()==null?10:baseUserDTO.getLimit();
         PageDataVO<BaseUserVo> dataVO= PageDataVO.pageInfo(page, limit, ()->getList(baseUserDTO));
+        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);
     }
 }