Ver Fonte

fix:多表关联的分页查询

wangzaijun há 7 meses atrás
pai
commit
3b36727b3c

+ 4 - 1
service-base/src/main/java/com/simuwang/base/pojo/dos/SysRoleUserDO.java

@@ -1,6 +1,8 @@
 package com.simuwang.base.pojo.dos;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.simuwang.base.pojo.vo.SysRoleUserVO;
+import com.simuwang.base.pojo.vo.SysRoleVO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -30,7 +32,8 @@ public class SysRoleUserDO extends SysRoleDO<SysRoleUserVO> {
 
     @Override
     public SysRoleUserVO toVo() {
-        SysRoleUserVO roleUserVO = super.toVo();
+        SysRoleVO vo = super.toVo();
+        SysRoleUserVO roleUserVO = BeanUtil.copyProperties(vo, SysRoleUserVO.class);
         roleUserVO.setUserId(this.userId);
         roleUserVO.setUserName(this.userName);
         roleUserVO.setEmail(this.email);

+ 3 - 2
service-manage/src/main/java/com/simuwang/manage/api/system/SysUserController.java

@@ -3,9 +3,10 @@ package com.simuwang.manage.api.system;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.pojo.dto.command.DeleteByIdCmd;
 import com.simuwang.base.pojo.dto.command.UpdateStatusCmd;
+import com.simuwang.base.pojo.dto.query.RoleUserPageQuery;
 import com.simuwang.base.pojo.dto.query.UserPageQuery;
-import com.simuwang.base.pojo.vo.SysUserVO;
 import com.simuwang.base.pojo.vo.SysRoleUserVO;
+import com.simuwang.base.pojo.vo.SysUserVO;
 import com.simuwang.manage.service.system.SysUserService;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,7 +42,7 @@ public class SysUserController {
      * @return /
      */
     @GetMapping("multi-join-page")
-    public MybatisPage<SysRoleUserVO> multiJoinPage(UserPageQuery query) {
+    public MybatisPage<SysRoleUserVO> multiJoinPage(RoleUserPageQuery query) {
         return this.service.findMultiPage(query);
     }