feat: 连表查询完成

common/common-generator/src/main/resources/vms/server/resourceMapper.vm

@@ -15,15 +15,19 @@
     </sql>
 
     <!-- 分页查询${classTitle}内容 -->
-    <select id="selectListByPage" resultType="$type">
+    <select id="selectListByPage" resultType="${type}Vo">
         select
-        <include refid="Base_Column_List"/>
-        from $tableName
+        base.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from $tableName base
+        left join sys_user create_user on create_user.id = base.create_user
+        left join sys_user update_user on update_user.id = base.update_user
         <where>
-            is_deleted = 0
+            base.is_deleted = 0
             #foreach($field in $pageQueryMap)
                 <if test="dto.${field.property} != null and dto.${field.property} != ''">
-                    and $field.column like CONCAT('%',#{dto.${field.property}},'%')
+                    and base.$field.column like CONCAT('%',#{dto.${field.property}},'%')
                 </if>
             #end
         </where>

common/common-generator/src/main/resources/vms/server/serviceImpl.vm

@@ -31,13 +31,7 @@ public class ${originalName}ServiceImpl extends ServiceImpl<${originalName}Mappe
      */
     @Override
     public PageResult<${originalName}Vo> get${originalName}List(Page<${originalName}> pageParams, ${originalName}Dto dto) {
-        IPage<${originalName}> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<${originalName}Vo> voList = page.getRecords().stream().map(${lowercaseName} -> {
-            ${originalName}Vo ${lowercaseName}Vo = new ${originalName}Vo();
-            BeanUtils.copyProperties(${lowercaseName}, ${lowercaseName}Vo);
-            return ${lowercaseName}Vo;
-        }).toList();
+        IPage<${originalName}Vo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<${originalName}Vo>builder()
                 .list(voList)

dao/src/main/java/cn/bunny/dao/dto/system/dept/DeptDto.java

@@ -13,12 +13,6 @@ import lombok.NoArgsConstructor;
 @Schema(name = "DeptDto对象", title = "部门", description = "部门管理")
 public class DeptDto {
 
-    @Schema(name = "parentId", title = "父级id")
-    private String parentId;
-
-    @Schema(name = "managerId", title = "管理者id")
-    private String managerId;
-
     @Schema(name = "deptName", title = "部门名称")
     private String deptName;
 

dao/src/main/java/cn/bunny/dao/view/ViewUserDept.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.view;
 
-import cn.bunny.dao.common.entity.BaseEntity;
+import cn.bunny.dao.common.entity.BaseUserEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("sys_user")
 @Schema(name = "AdminUserAndDept对象", title = "用户信息和部门Id", description = "用户信息和部门Id")
-public class ViewUserDept extends BaseEntity {
+public class ViewUserDept extends BaseUserEntity {
 
     @Schema(name = "username", title = "用户名")
     private String username;

dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.log;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "QuartzExecuteLogVo对象", title = "调度任务执行日志返回对象", description = "调度任务执行日志返回对象")
-public class QuartzExecuteLogVo extends BaseVo {
+public class QuartzExecuteLogVo extends BaseUserVo {
 
     @Schema(name = "jobName", title = "任务名称")
     private String jobName;

dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java

@@ -0,0 +1,41 @@
+package cn.bunny.dao.vo.log;
+
+import cn.bunny.dao.common.vo.BaseVo;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Schema(name = "UserLoginLogLocalVo对象", title = "用户登录日志", description = "用户登录日志")
+public class UserLoginLogLocalVo extends BaseVo {
+
+    @Schema(name = "userId", title = "用户Id")
+    private Long userId;
+
+    @Schema(name = "username", title = "用户名")
+    private String username;
+
+    @Schema(name = "token", title = "登录token")
+    private String token;
+
+    @Schema(name = "ipAddress", title = "登录Ip")
+    private String ipAddress;
+
+    @Schema(name = "ipRegion", title = "登录Ip归属地")
+    private String ipRegion;
+
+    @Schema(name = "userAgent", title = "登录时代理")
+    private String userAgent;
+
+    @Schema(name = "type", title = "操作类型")
+    private String type;
+
+    @Schema(name = "xRequestedWith", title = "标识客户端是否是通过Ajax发送请求的")
+    @JsonProperty("xRequestedWith")
+    private String xRequestedWith;
+
+}

dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.log;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -11,7 +11,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "UserLoginLogVo对象", title = "用户登录日志", description = "用户登录日志")
-public class UserLoginLogVo extends BaseVo {
+public class UserLoginLogVo extends BaseUserVo {
 
     @Schema(name = "userId", title = "用户Id")
     private Long userId;
@@ -38,4 +38,4 @@ public class UserLoginLogVo extends BaseVo {
     @JsonProperty("xRequestedWith")
     private String xRequestedWith;
 
-}
+}

dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.quartz;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "SchedulersGroupVo", title = "任务调度分组返回对象", description = "任务调度分组返回对象")
-public class SchedulersGroupVo extends BaseVo {
+public class SchedulersGroupVo extends BaseUserVo {
 
     @Schema(name = "groupName", title = "分组名称")
     private String groupName;

dao/src/main/java/cn/bunny/dao/vo/system/DeptVo.java

@@ -1,24 +1,22 @@
 package cn.bunny.dao.vo.system;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @Schema(name = "DeptVo对象", title = "部门", description = "部门管理")
-public class DeptVo extends BaseVo {
+public class DeptVo extends BaseUserVo {
 
     @Schema(name = "parentId", title = "父级id")
     private String parentId;
 
     @Schema(name = "manager", title = "管理者")
-    private List<String> manager;
+    private String manager;
 
     @Schema(name = "deptName", title = "部门名称")
     private String deptName;

dao/src/main/java/cn/bunny/dao/vo/system/MenuIconVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "MenuIconVo对象", title = "系统菜单图标", description = "系统菜单图标")
-public class MenuIconVo extends BaseVo {
+public class MenuIconVo extends BaseUserVo {
 
     @Schema(name = "iconCode", title = "icon类名")
     private String iconCode;

dao/src/main/java/cn/bunny/dao/vo/system/email/EmailTemplateVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.email;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -13,7 +13,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "EmailTemplateVo对象", title = "邮箱模板返回内容", description = "邮箱模板返回内容")
-public class EmailTemplateVo extends BaseVo {
+public class EmailTemplateVo extends BaseUserVo {
 
     @Schema(name = "templateName", title = "模板名称")
     private String templateName;

dao/src/main/java/cn/bunny/dao/vo/system/email/EmailUsersVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.email;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "EmailUsersVo对象", title = "邮箱用户发送配置", description = "邮箱用户发送配置管理")
-public class EmailUsersVo extends BaseVo {
+public class EmailUsersVo extends BaseUserVo {
 
     @Schema(name = "email", title = "邮箱")
     private String email;

dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.files;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "FilesVo对象", title = "系统文件", description = "管理端系统文件返回信息")
-public class FilesVo extends BaseVo {
+public class FilesVo extends BaseUserVo {
 
     @Schema(name = "filename", title = "文件的名称")
     private String filename;

dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.rolePower;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,7 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Schema(name = "PowerVo对象", title = "权限", description = "权限管理")
-public class PowerVo extends BaseVo {
+public class PowerVo extends BaseUserVo {
 
     @Schema(name = "parentId", title = "父级id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.rolePower;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -10,7 +10,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "RoleVo对象", title = "角色", description = "角色管理")
-public class RoleVo extends BaseVo {
+public class RoleVo extends BaseUserVo {
 
     @Schema(name = "roleCode", title = "角色代码")
     private String roleCode;

dao/src/main/java/cn/bunny/dao/vo/system/router/RouterManageVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.router;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -18,7 +18,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @ApiModel(value = "RouterControllerVo对象", description = "路由管理端返回对象")
-public class RouterManageVo extends BaseVo {
+public class RouterManageVo extends BaseUserVo {
 
     @ApiModelProperty("父级id")
     @JsonProperty("parentId")

dao/src/main/java/cn/bunny/dao/vo/system/user/AdminUserVo.java

@@ -1,6 +1,6 @@
 package cn.bunny.dao.vo.system.user;
 
-import cn.bunny.dao.common.vo.BaseVo;
+import cn.bunny.dao.common.vo.BaseUserVo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -13,7 +13,7 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 @Schema(name = "AdminUserVo对象", title = "用户信息", description = "用户信息")
-public class AdminUserVo extends BaseVo {
+public class AdminUserVo extends BaseUserVo {
 
     @Schema(name = "username", title = "用户名")
     private String username;

service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java

@@ -5,6 +5,7 @@ import cn.bunny.dao.entity.log.UserLoginLog;
 import cn.bunny.dao.pojo.result.PageResult;
 import cn.bunny.dao.pojo.result.Result;
 import cn.bunny.dao.pojo.result.ResultCodeEnum;
+import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
 import cn.bunny.dao.vo.log.UserLoginLogVo;
 import cn.bunny.services.service.UserLoginLogService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,13 +49,13 @@ public class UserLoginLogController {
 
     @Operation(summary = "获取本地用户登录日志", description = "获取本地用户登录日志")
     @GetMapping("noManage/getUserLoginLogListByLocalUser/{page}/{limit}")
-    public Mono<Result<PageResult<UserLoginLogVo>>> getUserLoginLogListByLocalUser(
+    public Mono<Result<PageResult<UserLoginLogLocalVo>>> getUserLoginLogListByLocalUser(
             @Parameter(name = "page", description = "当前页", required = true)
             @PathVariable("page") Integer page,
             @Parameter(name = "limit", description = "每页记录数", required = true)
             @PathVariable("limit") Integer limit) {
         Page<UserLoginLog> pageParams = new Page<>(page, limit);
-        PageResult<UserLoginLogVo> voPageResult = userLoginLogService.getUserLoginLogListByLocalUser(pageParams);
+        PageResult<UserLoginLogLocalVo> voPageResult = userLoginLogService.getUserLoginLogListByLocalUser(pageParams);
         return Mono.just(Result.success(voPageResult));
     }
 

service/src/main/java/cn/bunny/services/factory/UserLoginLogFactory.java

@@ -1,6 +1,5 @@
 package cn.bunny.services.factory;
 
-import cn.bunny.dao.entity.log.UserLoginLog;
 import cn.bunny.dao.pojo.result.PageResult;
 import cn.bunny.dao.vo.log.UserLoginLogVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +17,7 @@ public class UserLoginLogFactory {
      * @param page 分页结果
      * @return 分页用户登录日志
      */
-    public PageResult<UserLoginLogVo> getUserLoginLogVoPageResult(IPage<UserLoginLog> page) {
+    public PageResult<UserLoginLogVo> getUserLoginLogVoPageResult(IPage<UserLoginLogVo> page) {
         List<UserLoginLogVo> voList = page.getRecords().stream().map(userLoginLog -> {
             UserLoginLogVo userLoginLogVo = new UserLoginLogVo();
             BeanUtils.copyProperties(userLoginLog, userLoginLogVo);

service/src/main/java/cn/bunny/services/mapper/DeptMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.dept.DeptDto;
 import cn.bunny.dao.entity.system.Dept;
+import cn.bunny.dao.vo.system.DeptVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface DeptMapper extends BaseMapper<Dept> {
      * @param dto        部门查询表单
      * @return 部门分页结果
      */
-    IPage<Dept> selectListByPage(@Param("page") Page<Dept> pageParams, @Param("dto") DeptDto dto);
+    IPage<DeptVo> selectListByPage(@Param("page") Page<Dept> pageParams, @Param("dto") DeptDto dto);
 
     /**
      * 物理删除部门

service/src/main/java/cn/bunny/services/mapper/EmailTemplateMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.email.template.EmailTemplateDto;
 import cn.bunny.dao.entity.system.EmailTemplate;
+import cn.bunny.dao.vo.system.email.EmailTemplateVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface EmailTemplateMapper extends BaseMapper<EmailTemplate> {
      * @param dto        邮件模板表查询表单
      * @return 邮件模板表分页结果
      */
-    IPage<EmailTemplate> selectListByPage(@Param("page") Page<EmailTemplate> pageParams, @Param("dto") EmailTemplateDto dto);
+    IPage<EmailTemplateVo> selectListByPage(@Param("page") Page<EmailTemplate> pageParams, @Param("dto") EmailTemplateDto dto);
 
     /**
      * 物理删除邮件模板表

service/src/main/java/cn/bunny/services/mapper/EmailUsersMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.email.user.EmailUsersDto;
 import cn.bunny.dao.entity.system.EmailUsers;
+import cn.bunny.dao.vo.system.email.EmailUsersVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface EmailUsersMapper extends BaseMapper<EmailUsers> {
      * @param dto        邮箱用户发送配置查询表单
      * @return 邮箱用户发送配置分页结果
      */
-    IPage<EmailUsers> selectListByPage(@Param("page") Page<EmailUsers> pageParams, @Param("dto") EmailUsersDto dto);
+    IPage<EmailUsersVo> selectListByPage(@Param("page") Page<EmailUsers> pageParams, @Param("dto") EmailUsersDto dto);
 
     /**
      * 物理删除邮箱用户发送配置

service/src/main/java/cn/bunny/services/mapper/FilesMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.files.FilesDto;
 import cn.bunny.dao.entity.system.Files;
+import cn.bunny.dao.vo.system.files.FilesVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface FilesMapper extends BaseMapper<Files> {
      * @param dto        系统文件表查询表单
      * @return 系统文件表分页结果
      */
-    IPage<Files> selectListByPage(@Param("page") Page<Files> pageParams, @Param("dto") FilesDto dto);
+    IPage<FilesVo> selectListByPage(@Param("page") Page<Files> pageParams, @Param("dto") FilesDto dto);
 
     /**
      * 物理删除系统文件表

service/src/main/java/cn/bunny/services/mapper/MenuIconMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.menuIcon.MenuIconDto;
 import cn.bunny.dao.entity.system.MenuIcon;
+import cn.bunny.dao.vo.system.MenuIconVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface MenuIconMapper extends BaseMapper<MenuIcon> {
      * @param dto        系统菜单图标查询表单
      * @return 系统菜单图标分页结果
      */
-    IPage<MenuIcon> selectListByPage(@Param("page") Page<MenuIcon> pageParams, @Param("dto") MenuIconDto dto);
+    IPage<MenuIconVo> selectListByPage(@Param("page") Page<MenuIcon> pageParams, @Param("dto") MenuIconDto dto);
 
     /**
      * 物理删除系统菜单图标

service/src/main/java/cn/bunny/services/mapper/PowerMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.rolePower.power.PowerDto;
 import cn.bunny.dao.entity.system.Power;
+import cn.bunny.dao.vo.system.rolePower.PowerVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,7 +30,7 @@ public interface PowerMapper extends BaseMapper<Power> {
      * @param dto        权限查询表单
      * @return 权限分页结果
      */
-    IPage<Power> selectListByPage(@Param("page") Page<Power> pageParams, @Param("dto") PowerDto dto);
+    IPage<PowerVo> selectListByPage(@Param("page") Page<Power> pageParams, @Param("dto") PowerDto dto);
 
     /**
      * 物理删除权限

service/src/main/java/cn/bunny/services/mapper/RoleMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.rolePower.role.RoleDto;
 import cn.bunny.dao.entity.system.Role;
+import cn.bunny.dao.vo.system.rolePower.RoleVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -29,7 +30,7 @@ public interface RoleMapper extends BaseMapper<Role> {
      * @param dto        角色查询表单
      * @return 角色分页结果
      */
-    IPage<Role> selectListByPage(@Param("page") Page<Role> pageParams, @Param("dto") RoleDto dto);
+    IPage<RoleVo> selectListByPage(@Param("page") Page<Role> pageParams, @Param("dto") RoleDto dto);
 
     /**
      * 物理删除角色

service/src/main/java/cn/bunny/services/mapper/RouterMapper.java

@@ -3,6 +3,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.system.router.RouterManageDto;
 import cn.bunny.dao.entity.system.Router;
+import cn.bunny.dao.vo.system.router.RouterManageVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +46,15 @@ public interface RouterMapper extends BaseMapper<Router> {
      * @param dto        路由查询表单
      * @return 分页结果
      */
-    IPage<Router> selectListByPage(@Param("page") Page<Router> pageParams, @Param("dto") RouterManageDto dto);
+    IPage<RouterManageVo> selectListByPage(@Param("page") Page<Router> pageParams, @Param("dto") RouterManageDto dto);
+
+    /**
+     * * 管理菜单列表不分页
+     *
+     * @param dto 路由查询表单
+     * @return 分页结果
+     */
+    List<RouterManageVo> selectAllList(@Param("dto") RouterManageDto dto);
 
     /**
      * * 物理删除路由菜单

service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.log.ScheduleExecuteLogDto;
 import cn.bunny.dao.entity.log.ScheduleExecuteLog;
+import cn.bunny.dao.vo.log.QuartzExecuteLogVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface ScheduleExecuteLogMapper extends BaseMapper<ScheduleExecuteLog>
      * @param dto        调度任务执行日志查询表单
      * @return 调度任务执行日志分页结果
      */
-    IPage<ScheduleExecuteLog> selectListByPage(@Param("page") Page<ScheduleExecuteLog> pageParams, @Param("dto") ScheduleExecuteLogDto dto);
+    IPage<QuartzExecuteLogVo> selectListByPage(@Param("page") Page<ScheduleExecuteLog> pageParams, @Param("dto") ScheduleExecuteLogDto dto);
 
     /**
      * 物理删除调度任务执行日志

service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto;
 import cn.bunny.dao.entity.quartz.SchedulersGroup;
+import cn.bunny.dao.vo.quartz.SchedulersGroupVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface SchedulersGroupMapper extends BaseMapper<SchedulersGroup> {
      * @param dto        任务调度分组查询表单
      * @return 任务调度分组分页结果
      */
-    IPage<SchedulersGroup> selectListByPage(@Param("page") Page<SchedulersGroup> pageParams, @Param("dto") SchedulersGroupDto dto);
+    IPage<SchedulersGroupVo> selectListByPage(@Param("page") Page<SchedulersGroup> pageParams, @Param("dto") SchedulersGroupDto dto);
 
     /**
      * 物理删除任务调度分组

service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java

@@ -2,6 +2,7 @@ package cn.bunny.services.mapper;
 
 import cn.bunny.dao.dto.log.UserLoginLogDto;
 import cn.bunny.dao.entity.log.UserLoginLog;
+import cn.bunny.dao.vo.log.UserLoginLogVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,7 +29,7 @@ public interface UserLoginLogMapper extends BaseMapper<UserLoginLog> {
      * @param dto        用户登录日志查询表单
      * @return 用户登录日志分页结果
      */
-    IPage<UserLoginLog> selectListByPage(@Param("page") Page<UserLoginLog> pageParams, @Param("dto") UserLoginLogDto dto);
+    IPage<UserLoginLogVo> selectListByPage(@Param("page") Page<UserLoginLog> pageParams, @Param("dto") UserLoginLogDto dto);
 
     /**
      * 物理删除用户登录日志

service/src/main/java/cn/bunny/services/service/UserLoginLogService.java

@@ -3,6 +3,7 @@ package cn.bunny.services.service;
 import cn.bunny.dao.dto.log.UserLoginLogDto;
 import cn.bunny.dao.entity.log.UserLoginLog;
 import cn.bunny.dao.pojo.result.PageResult;
+import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
 import cn.bunny.dao.vo.log.UserLoginLogVo;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -39,5 +40,5 @@ public interface UserLoginLogService extends IService<UserLoginLog> {
      * @param pageParams 分页查询内容
      * @return 用户登录日志返回列表
      */
-    PageResult<UserLoginLogVo> getUserLoginLogListByLocalUser(Page<UserLoginLog> pageParams);
+    PageResult<UserLoginLogLocalVo> getUserLoginLogListByLocalUser(Page<UserLoginLog> pageParams);
 }

service/src/main/java/cn/bunny/services/service/impl/DeptServiceImpl.java

@@ -21,7 +21,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,20 +49,10 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     @Override
     public PageResult<DeptVo> getDeptList(Page<Dept> pageParams, DeptDto dto) {
         // 分页查询菜单图标
-        IPage<Dept> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<DeptVo> voList = page.getRecords().stream().map(dept -> {
-            // 将数据库中管理员取出
-            List<String> mangerList = Arrays.stream(dept.getManager().split(",")).map(String::trim).toList();
-
-            DeptVo deptVo = new DeptVo();
-            BeanUtils.copyProperties(dept, deptVo);
-            deptVo.setManager(mangerList);
-            return deptVo;
-        }).toList();
+        IPage<DeptVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<DeptVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/EmailTemplateServiceImpl.java

@@ -45,16 +45,10 @@ public class EmailTemplateServiceImpl extends ServiceImpl<EmailTemplateMapper, E
     @Override
     public PageResult<EmailTemplateVo> getEmailTemplateList(Page<EmailTemplate> pageParams, EmailTemplateDto dto) {
         // 分页查询菜单图标
-        IPage<EmailTemplate> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<EmailTemplateVo> voList = page.getRecords().stream().map(emailTemplate -> {
-            EmailTemplateVo emailTemplateVo = new EmailTemplateVo();
-            BeanUtils.copyProperties(emailTemplate, emailTemplateVo);
-            return emailTemplateVo;
-        }).toList();
+        IPage<EmailTemplateVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<EmailTemplateVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/EmailUsersServiceImpl.java

@@ -50,16 +50,10 @@ public class EmailUsersServiceImpl extends ServiceImpl<EmailUsersMapper, EmailUs
     @Override
     public PageResult<EmailUsersVo> getEmailUsersList(Page<EmailUsers> pageParams, EmailUsersDto dto) {
         // 分页查询菜单图标
-        IPage<EmailUsers> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<EmailUsersVo> voList = page.getRecords().stream().map(emailUsers -> {
-            EmailUsersVo emailUsersVo = new EmailUsersVo();
-            BeanUtils.copyProperties(emailUsers, emailUsersVo);
-            return emailUsersVo;
-        }).toList();
+        IPage<EmailUsersVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<EmailUsersVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java

@@ -74,16 +74,10 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, Files> implements
     @Override
     public PageResult<FilesVo> getFilesList(Page<Files> pageParams, FilesDto dto) {
         // 分页查询菜单图标
-        IPage<Files> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<FilesVo> voList = page.getRecords().stream().map(files -> {
-            FilesVo filesVo = new FilesVo();
-            BeanUtils.copyProperties(files, filesVo);
-            return filesVo;
-        }).toList();
+        IPage<FilesVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<FilesVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/MenuIconServiceImpl.java

@@ -46,16 +46,9 @@ public class MenuIconServiceImpl extends ServiceImpl<MenuIconMapper, MenuIcon> i
     @Override
     public PageResult<MenuIconVo> getMenuIconList(Page<MenuIcon> pageParams, MenuIconDto dto) {
         // 分页查询菜单图标
-        IPage<MenuIcon> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<MenuIconVo> voList = page.getRecords().stream().map(MenuIcon -> {
-            MenuIconVo MenuIconVo = new MenuIconVo();
-            BeanUtils.copyProperties(MenuIcon, MenuIconVo);
-            return MenuIconVo;
-        }).toList();
-
+        IPage<MenuIconVo> page = baseMapper.selectListByPage(pageParams, dto);
         return PageResult.<MenuIconVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java

@@ -52,16 +52,10 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
     @Override
     public PageResult<PowerVo> getPowerList(Page<Power> pageParams, PowerDto dto) {
         // 分页查询菜单图标
-        IPage<Power> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<PowerVo> voList = page.getRecords().stream().map(Power -> {
-            PowerVo PowerVo = new PowerVo();
-            BeanUtils.copyProperties(Power, PowerVo);
-            return PowerVo;
-        }).toList();
+        IPage<PowerVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<PowerVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java

@@ -61,16 +61,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     @Override
     public PageResult<RoleVo> getRoleList(Page<Role> pageParams, RoleDto dto) {
         // 分页查询菜单图标
-        IPage<Role> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<RoleVo> voList = page.getRecords().stream().map(Role -> {
-            RoleVo RoleVo = new RoleVo();
-            BeanUtils.copyProperties(Role, RoleVo);
-            return RoleVo;
-        }).toList();
+        IPage<RoleVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<RoleVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java

@@ -22,7 +22,6 @@ import cn.bunny.services.mapper.RouterMapper;
 import cn.bunny.services.mapper.RouterRoleMapper;
 import cn.bunny.services.security.custom.CustomCheckIsAdmin;
 import cn.bunny.services.service.RouterService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,7 +30,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -170,15 +168,10 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
      */
     @Override
     public PageResult<RouterManageVo> getMenusByPage(Page<Router> pageParams, RouterManageDto dto) {
-        IPage<Router> page = baseMapper.selectListByPage(pageParams, dto);
+        IPage<RouterManageVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         // 构建返回对象
         List<RouterManageVo> voList = page.getRecords().stream()
-                .map(router -> {
-                    RouterManageVo routerManageVo = new RouterManageVo();
-                    BeanUtils.copyProperties(router, routerManageVo);
-                    return routerManageVo;
-                })
                 .sorted(Comparator.comparing(RouterManageVo::getRouterRank))
                 .toList();
 
@@ -197,16 +190,8 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
      */
     @Override
     public List<RouterManageVo> getMenusList(RouterManageDto dto) {
-        LambdaQueryWrapper<Router> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.like(StringUtils.hasText(dto.getTitle()), Router::getTitle, dto.getTitle());
-        lambdaQueryWrapper.eq(dto.getVisible() != null, Router::getVisible, dto.getVisible());
-
-        return list(lambdaQueryWrapper).stream()
-                .map(router -> {
-                    RouterManageVo routerManageVo = new RouterManageVo();
-                    BeanUtils.copyProperties(router, routerManageVo);
-                    return routerManageVo;
-                })
+        List<RouterManageVo> list = baseMapper.selectAllList(dto);
+        return list.stream()
                 .sorted(Comparator.comparing(RouterManageVo::getRouterRank))
                 .toList();
     }

service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java

@@ -9,7 +9,6 @@ import cn.bunny.services.service.ScheduleExecuteLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -35,16 +34,10 @@ public class ScheduleExecuteLogServiceImpl extends ServiceImpl<ScheduleExecuteLo
     @Override
     public PageResult<QuartzExecuteLogVo> getQuartzExecuteLogList(Page<ScheduleExecuteLog> pageParams, ScheduleExecuteLogDto dto) {
         // 分页查询菜单图标
-        IPage<ScheduleExecuteLog> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<QuartzExecuteLogVo> voList = page.getRecords().stream().map(quartzExecuteLog -> {
-            QuartzExecuteLogVo quartzExecuteLogVo = new QuartzExecuteLogVo();
-            BeanUtils.copyProperties(quartzExecuteLog, quartzExecuteLogVo);
-            return quartzExecuteLogVo;
-        }).toList();
+        IPage<QuartzExecuteLogVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<QuartzExecuteLogVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java

@@ -40,16 +40,10 @@ public class SchedulersGroupServiceImpl extends ServiceImpl<SchedulersGroupMappe
     @Override
     public PageResult<SchedulersGroupVo> getSchedulersGroupList(Page<SchedulersGroup> pageParams, SchedulersGroupDto dto) {
         // 分页查询菜单图标
-        IPage<SchedulersGroup> page = baseMapper.selectListByPage(pageParams, dto);
-
-        List<SchedulersGroupVo> voList = page.getRecords().stream().map(schedulersGroup -> {
-            SchedulersGroupVo schedulersGroupVo = new SchedulersGroupVo();
-            BeanUtils.copyProperties(schedulersGroup, schedulersGroupVo);
-            return schedulersGroupVo;
-        }).toList();
+        IPage<SchedulersGroupVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<SchedulersGroupVo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java

@@ -4,6 +4,7 @@ import cn.bunny.common.service.context.BaseContext;
 import cn.bunny.dao.dto.log.UserLoginLogDto;
 import cn.bunny.dao.entity.log.UserLoginLog;
 import cn.bunny.dao.pojo.result.PageResult;
+import cn.bunny.dao.vo.log.UserLoginLogLocalVo;
 import cn.bunny.dao.vo.log.UserLoginLogVo;
 import cn.bunny.services.factory.UserLoginLogFactory;
 import cn.bunny.services.mapper.UserLoginLogMapper;
@@ -11,6 +12,7 @@ import cn.bunny.services.service.UserLoginLogService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,7 +44,7 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
     @Override
     public PageResult<UserLoginLogVo> getUserLoginLogList(Page<UserLoginLog> pageParams, UserLoginLogDto dto) {
         // 分页查询菜单图标
-        IPage<UserLoginLog> page = baseMapper.selectListByPage(pageParams, dto);
+        IPage<UserLoginLogVo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return factory.getUserLoginLogVoPageResult(page);
     }
@@ -68,10 +70,21 @@ public class UserLoginLogServiceImpl extends ServiceImpl<UserLoginLogMapper, Use
      * @return 用户登录日志返回列表
      */
     @Override
-    public PageResult<UserLoginLogVo> getUserLoginLogListByLocalUser(Page<UserLoginLog> pageParams) {
+    public PageResult<UserLoginLogLocalVo> getUserLoginLogListByLocalUser(Page<UserLoginLog> pageParams) {
         Long userId = BaseContext.getUserId();
         IPage<UserLoginLog> page = baseMapper.selectListByPageWithLocalUser(pageParams, userId);
 
-        return factory.getUserLoginLogVoPageResult(page);
+        List<UserLoginLogLocalVo> voList = page.getRecords().stream().map(userLoginLog -> {
+            UserLoginLogLocalVo userLoginLogVo = new UserLoginLogLocalVo();
+            BeanUtils.copyProperties(userLoginLog, userLoginLogVo);
+            return userLoginLogVo;
+        }).toList();
+
+        return PageResult.<UserLoginLogLocalVo>builder()
+                .list(voList)
+                .pageNo(page.getCurrent())
+                .pageSize(page.getSize())
+                .total(page.getTotal())
+                .build();
     }
 }

service/src/main/resources/mapper/DeptMapper.xml

@@ -22,23 +22,23 @@
     </sql>
 
     <!-- 分页查询部门内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.Dept">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.DeptVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_dept
+        dept.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_dept dept
+        left join sys_user create_user on create_user.id = dept.create_user
+        left join sys_user update_user on update_user.id = dept.update_user
         <where>
-            is_deleted = 0
-            <if test="dto.parentId != null and dto.parentId != ''">
-                and parent_id like CONCAT('%',#{dto.parentId},'%')
-            </if>
+            dept.is_deleted = 0
             <if test="dto.deptName != null and dto.deptName != ''">
-                and dept_name like CONCAT('%',#{dto.deptName},'%')
+                and dept.dept_name like CONCAT('%',#{dto.deptName},'%')
             </if>
             <if test="dto.summary != null and dto.summary != ''">
-                and summary like CONCAT('%',#{dto.summary},'%')
+                and dept.summary like CONCAT('%',#{dto.summary},'%')
             </if>
         </where>
-        order by update_time
     </select>
 
     <!-- 物理删除部门 -->

service/src/main/resources/mapper/EmailTemplateMapper.xml

@@ -24,23 +24,27 @@
     </sql>
 
     <!-- 分页查询邮件模板表内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.EmailTemplate">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.email.EmailTemplateVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_email_template
+        template.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_email_template template
+        left join sys_user create_user on create_user.id = template.create_user
+        left join sys_user update_user on update_user.id = template.update_user
         <where>
-            is_deleted = 0
+            template.is_deleted = 0
             <if test="dto.templateName != null and dto.templateName != ''">
-                and template_name like CONCAT('%',#{dto.templateName},'%')
+                and template.template_name like CONCAT('%',#{dto.templateName},'%')
             </if>
             <if test="dto.subject != null and dto.subject != ''">
-                and subject like CONCAT('%',#{dto.subject},'%')
+                and template.subject like CONCAT('%',#{dto.subject},'%')
             </if>
             <if test="dto.body != null and dto.body != ''">
-                and body like CONCAT('%',#{dto.body},'%')
+                and template.body like CONCAT('%',#{dto.body},'%')
             </if>
             <if test="dto.type != null and dto.type != ''">
-                and type like CONCAT('%',#{dto.type},'%')
+                and template.type like CONCAT('%',#{dto.type},'%')
             </if>
         </where>
     </select>

service/src/main/resources/mapper/EmailUsersMapper.xml

@@ -24,26 +24,29 @@
     </sql>
 
     <!-- 分页查询邮箱用户发送配置内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.EmailUsers">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.email.EmailUsersVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_email_users
+        email_user.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_email_users email_user
+        left join sys_user create_user on create_user.id = email_user.create_user
+        left join sys_user update_user on update_user.id = email_user.update_user
         <where>
-            is_deleted = 0
+            email_user.is_deleted = 0
             <if test="dto.email != null and dto.email != ''">
-                and email like CONCAT('%',#{dto.email},'%')
+                and email_user.email like CONCAT('%',#{dto.email},'%')
             </if>
             <if test="dto.host != null and dto.host != ''">
-                and host like CONCAT('%',#{dto.host},'%')
+                and email_user.host like CONCAT('%',#{dto.host},'%')
             </if>
             <if test="dto.port != null and dto.port != ''">
-                and port like CONCAT('%',#{dto.port},'%')
+                and email_user.port like CONCAT('%',#{dto.port},'%')
             </if>
             <if test="dto.smtpAgreement != null and dto.smtpAgreement != ''">
-                and smtp_agreement like CONCAT('%',#{dto.smtpAgreement},'%')
+                and email_user.smtp_agreement like CONCAT('%',#{dto.smtpAgreement},'%')
             </if>
         </where>
-        order by create_time desc
     </select>
 
     <!-- 物理删除邮箱用户发送配置 -->

service/src/main/resources/mapper/FilesMapper.xml

@@ -23,26 +23,29 @@
     </sql>
 
     <!-- 分页查询系统文件表内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.Files">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.files.FilesVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_files
+        files.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_files files
+        left join sys_user create_user on create_user.id = files.create_user
+        left join sys_user update_user on update_user.id = files.update_user
         <where>
-            is_deleted = 0
+            files.is_deleted = 0
             <if test="dto.filename != null and dto.filename != ''">
-                and filename like CONCAT('%',#{dto.filename},'%')
+                and files.filename like CONCAT('%',#{dto.filename},'%')
             </if>
             <if test="dto.filepath != null and dto.filepath != ''">
-                and filepath like CONCAT('%',#{dto.filepath},'%')
+                and files.filepath like CONCAT('%',#{dto.filepath},'%')
             </if>
             <if test="dto.fileType != null and dto.fileType != ''">
-                and file_type like CONCAT('%',#{dto.fileType},'%')
+                and files.file_type like CONCAT('%',#{dto.fileType},'%')
             </if>
             <if test="dto.downloadCount != null and dto.downloadCount != ''">
-                and download_count like CONCAT('%',#{dto.downloadCount},'%')
+                and files.download_count like CONCAT('%',#{dto.downloadCount},'%')
             </if>
         </where>
-        order by update_time
     </select>
 
     <!-- 物理删除系统文件表 -->

service/src/main/resources/mapper/MenuIconMapper.xml

@@ -20,20 +20,23 @@
     </sql>
 
     <!-- 分页查询系统菜单图标内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.MenuIcon">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.MenuIconVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_menu_icon
+        icon.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_menu_icon icon
+        left join sys_user create_user on create_user.id = icon.create_user
+        left join sys_user update_user on update_user.id = icon.update_user
         <where>
-            is_deleted = 0
+            icon.is_deleted = 0
             <if test="dto.iconCode != null and dto.iconCode != ''">
-                and icon_code like CONCAT('%',#{dto.iconCode},'%')
+                and icon.icon_code like CONCAT('%',#{dto.iconCode},'%')
             </if>
             <if test="dto.iconName != null and dto.iconName != ''">
-                and icon_name like CONCAT('%',#{dto.iconName},'%')
+                and icon.icon_name like CONCAT('%',#{dto.iconName},'%')
             </if>
         </where>
-        order by update_time desc
     </select>
 
     <!-- 物理删除系统菜单图标 -->

service/src/main/resources/mapper/PowerMapper.xml

@@ -22,23 +22,26 @@
     </sql>
 
     <!-- 分页查询权限内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.Power">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.rolePower.PowerVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_power
+        power.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_power power
+        left join sys_user create_user on create_user.id = power.create_user
+        left join sys_user update_user on update_user.id = power.update_user
         <where>
-            is_deleted = 0
+            power.is_deleted = 0
             <if test="dto.powerCode != null and dto.powerCode != ''">
-                and power_code like CONCAT('%',#{dto.powerCode},'%')
+                and power.power_code like CONCAT('%',#{dto.powerCode},'%')
             </if>
             <if test="dto.powerName != null and dto.powerName != ''">
-                and power_name like CONCAT('%',#{dto.powerName},'%')
+                and power.power_name like CONCAT('%',#{dto.powerName},'%')
             </if>
             <if test="dto.requestUrl != null and dto.requestUrl != ''">
-                and request_url like CONCAT('%',#{dto.requestUrl},'%')
+                and power.request_url like CONCAT('%',#{dto.requestUrl},'%')
             </if>
         </where>
-        order by update_time desc
     </select>
 
     <!-- 物理删除权限 -->

service/src/main/resources/mapper/RoleMapper.xml

@@ -20,17 +20,21 @@
     </sql>
 
     <!-- 分页查询角色内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.Role">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.rolePower.RoleVo">
         select
-        <include refid="Base_Column_List"/>
-        from sys_role
+        role.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_role role
+        left join sys_user create_user on create_user.id = role.create_user
+        left join sys_user update_user on update_user.id = role.update_user
         <where>
-            is_deleted = 0
+            role.is_deleted = 0
             <if test="dto.roleCode != null and dto.roleCode != ''">
-                and role_code like CONCAT('%',#{dto.roleCode},'%')
+                and role.role_code like CONCAT('%',#{dto.roleCode},'%')
             </if>
             <if test="dto.description != null and dto.description != ''">
-                and description like CONCAT('%',#{dto.description},'%')
+                and role.description like CONCAT('%',#{dto.description},'%')
             </if>
         </where>
     </select>

service/src/main/resources/mapper/RouterMapper.xml

@@ -66,16 +66,41 @@
     </select>
 
     <!-- 管理菜单列表 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.system.Router">
-        select *
-        from sys_router
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.system.router.RouterManageVo">
+        select
+        router.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_router router
+        left join sys_user create_user on create_user.id = router.create_user
+        left join sys_user update_user on update_user.id = router.update_user
         <where>
-            is_deleted = 0
+            role.is_deleted = 0
             <if test="dto.title != null and dto.title != ''">
-                and title like CONCAT('%',#{dto.title},'%')
+                and router.title like CONCAT('%',#{dto.title},'%')
             </if>
             <if test="dto.visible != null">
-                and visible = #{dto.visible}
+                and router.visible = #{dto.visible}
+            </if>
+        </where>
+    </select>
+
+    <!-- 管理菜单列表不分页 -->
+    <select id="selectAllList" resultType="cn.bunny.dao.vo.system.router.RouterManageVo">
+        select
+        router.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_router router
+        left join sys_user create_user on create_user.id = router.create_user
+        left join sys_user update_user on update_user.id = router.update_user
+        <where>
+            router.is_deleted = 0
+            <if test="dto.title != null and dto.title != ''">
+                and router.title like CONCAT('%',#{dto.title},'%')
+            </if>
+            <if test="dto.visible != null">
+                and router.visible = #{dto.visible}
             </if>
         </where>
     </select>

service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml

@@ -25,29 +25,32 @@
     </sql>
 
     <!-- 分页查询调度任务执行日志内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.log.ScheduleExecuteLog">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.log.QuartzExecuteLogVo">
         select
-        <include refid="Base_Column_List"/>
-        from log_quartz_execute
+        log.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from log_quartz_execute log
+        left join sys_user create_user on create_user.id = log.create_user
+        left join sys_user update_user on update_user.id = log.update_user
         <where>
-            is_deleted = 0
+            log.is_deleted = 0
             <if test="dto.jobName != null and dto.jobName != ''">
-                and job_name like CONCAT('%',#{dto.jobName},'%')
+                and log.job_name like CONCAT('%',#{dto.jobName},'%')
             </if>
             <if test="dto.jobGroup != null and dto.jobGroup != ''">
-                and job_group like CONCAT('%',#{dto.jobGroup},'%')
+                and log.job_group like CONCAT('%',#{dto.jobGroup},'%')
             </if>
             <if test="dto.jobClassName != null and dto.jobClassName != ''">
-                and job_class_name like CONCAT('%',#{dto.jobClassName},'%')
+                and log.job_class_name like CONCAT('%',#{dto.jobClassName},'%')
             </if>
             <if test="dto.cronExpression != null and dto.cronExpression != ''">
-                and cron_expression like CONCAT('%',#{dto.cronExpression},'%')
+                and log.cron_expression like CONCAT('%',#{dto.cronExpression},'%')
             </if>
             <if test="dto.triggerName != null and dto.triggerName != ''">
-                and trigger_name like CONCAT('%',#{dto.triggerName},'%')
+                and log.trigger_name like CONCAT('%',#{dto.triggerName},'%')
             </if>
         </where>
-        order by update_time desc
     </select>
 
     <!-- 物理删除调度任务执行日志 -->

service/src/main/resources/mapper/SchedulersGroupMapper.xml

@@ -20,19 +20,23 @@
     </sql>
 
     <!-- 分页查询任务调度分组内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.quartz.SchedulersGroup">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.quartz.SchedulersGroupVo">
         select
-        <include refid="Base_Column_List"/>
-        from qrtz_schedulers_group
+        schedulers_group.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from qrtz_schedulers_group schedulers_group
+        left join sys_user create_user on create_user.id = schedulers_group.create_user
+        left join sys_user update_user on update_user.id = schedulers_group.update_user
         <where>
+            schedulers_group.is_deleted = 0
             <if test="dto.groupName != null and dto.groupName != ''">
-                and group_name like CONCAT('%',#{dto.groupName},'%')
+                and schedulers_group.group_name like CONCAT('%',#{dto.groupName},'%')
             </if>
             <if test="dto.description != null and dto.description != ''">
-                and description like CONCAT('%',#{dto.description},'%')
+                and schedulers_group.description like CONCAT('%',#{dto.description},'%')
             </if>
         </where>
-        order by update_time desc
     </select>
 
     <!-- 物理删除任务调度分组 -->

service/src/main/resources/mapper/UserLoginLogMapper.xml

@@ -26,26 +26,30 @@
     </sql>
 
     <!-- 分页查询用户登录日志内容 -->
-    <select id="selectListByPage" resultType="cn.bunny.dao.entity.log.UserLoginLog">
+    <select id="selectListByPage" resultType="cn.bunny.dao.vo.log.UserLoginLogVo">
         select
-        <include refid="Base_Column_List"/>
-        from log_user_login
+        user_login.*,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from log_user_login user_login
+        left join sys_user create_user on create_user.id = user_login.create_user
+        left join sys_user update_user on update_user.id = user_login.update_user
         <where>
-            is_deleted = 0
+            user_login.is_deleted = 0
             <if test="dto.username != null and dto.username != ''">
-                and username like CONCAT('%',#{dto.username},'%')
+                and user_login.username like CONCAT('%',#{dto.username},'%')
             </if>
             <if test="dto.ipAddress != null and dto.ipAddress != ''">
-                and ip_address like CONCAT('%',#{dto.ipAddress},'%')
+                and user_login.ip_address like CONCAT('%',#{dto.ipAddress},'%')
             </if>
             <if test="dto.ipRegion != null and dto.ipRegion != ''">
-                and ip_region like CONCAT('%',#{dto.ipRegion},'%')
+                and user_login.ip_region like CONCAT('%',#{dto.ipRegion},'%')
             </if>
             <if test="dto.type != null and dto.type != ''">
-                and type like CONCAT('%',#{dto.type},'%')
+                and user_login.type like CONCAT('%',#{dto.type},'%')
             </if>
             <if test="dto.xRequestedWith != null and dto.xRequestedWith != ''">
-                and x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%')
+                and user_login.x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%')
             </if>
         </where>
     </select>
@@ -54,7 +58,7 @@
     <select id="selectListByPageWithLocalUser" resultType="cn.bunny.dao.entity.log.UserLoginLog">
         select
         <include refid="Base_Column_List"/>
-        from log_user_login where user_id = #{id} order by create_time desc
+        from log_user_login where user_id = #{id}
     </select>
 
     <!-- 物理删除用户登录日志 -->

service/src/main/resources/mapper/UserMapper.xml

@@ -31,30 +31,36 @@
     <!-- 分页查询用户信息内容 -->
     <select id="selectListByPage" resultType="cn.bunny.dao.view.ViewUserDept">
         select
-        user.*,user_dept.dept_id
-        from sys_user user left join sys_user_dept user_dept on user.id = user_dept.user_id
+        user.*,
+        user_dept.dept_id,
+        create_user.username as create_username,
+        update_user.username as update_username
+        from sys_user user
+        left join sys_user_dept user_dept on user.id = user_dept.user_id
+        left join sys_user create_user on create_user.id = user.create_user
+        left join sys_user update_user on update_user.id = user.update_user
         <where>
             user.is_deleted = 0
             <if test="dto.username != null and dto.username != ''">
-                and username like CONCAT('%',#{dto.username},'%')
+                and user.username like CONCAT('%',#{dto.username},'%')
             </if>
             <if test="dto.nickname != null and dto.nickname != ''">
-                and nickname like CONCAT('%',#{dto.nickname},'%')
+                and user.nickname like CONCAT('%',#{dto.nickname},'%')
             </if>
             <if test="dto.email != null and dto.email != ''">
-                and email like CONCAT('%',#{dto.email},'%')
+                and user.email like CONCAT('%',#{dto.email},'%')
             </if>
             <if test="dto.phone != null and dto.phone != ''">
-                and phone like CONCAT('%',#{dto.phone},'%')
+                and user.phone like CONCAT('%',#{dto.phone},'%')
             </if>
             <if test="dto.sex != null and dto.sex != ''">
-                and sex = #{dto.sex}
+                and user.sex = #{dto.sex}
             </if>
             <if test="dto.summary != null and dto.summary != ''">
-                and summary like CONCAT('%',#{dto.summary},'%')
+                and user.summary like CONCAT('%',#{dto.summary},'%')
             </if>
             <if test="dto.status != null and dto.status != ''">
-                and status = #{dto.status}
+                and user.status = #{dto.status}
             </if>
             <if test="dto.deptIds != null and dto.deptIds.size() > 0">
                 and user_dept.dept_id in