提交 6133a372 authored 作者: hzh's avatar hzh

代码优化

上级 31a73f06
...@@ -229,6 +229,18 @@ public class SysUserController extends BaseController { ...@@ -229,6 +229,18 @@ public class SysUserController extends BaseController {
return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId)); return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId));
} }
/**
* 全量数据
*/
@GetMapping("/full-list")
public TableDataInfo<SysUserVo> fullList(SysUserBo user, PageQuery pageQuery) {
user.setUserType(UserType.SYS_USER.getUserType());
if (LoginHelper.isVirtual()) {
user.setUserId(-1L);
}
return userService.selectPageUserFullList(user, pageQuery);
}
/** /**
* 重置密码 * 重置密码
*/ */
......
package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.common.sensitive.annotation.Sensitive;
import org.dromara.common.sensitive.core.SensitiveStrategy;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.system.domain.SysUser;
import java.io.Serial;
import java.io.Serializable;
/**
* 用户信息视图对象 sys_user
*
* @author Michelle.Chung
*/
@Data
@AutoMapper(target = SysUser.class)
public class SysUserFullListVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 用户ID
*/
private Long userId;
/**
* 租户ID
*/
private String tenantId;
/**
* 部门ID
*/
private Long deptId;
/**
* 用户账号
*/
private String userName;
/**
* 用户昵称
*/
private String nickName;
/**
* 用户类型(sys_user系统用户)
*/
private String userType;
/**
* 用户邮箱
*/
@Sensitive(strategy = SensitiveStrategy.EMAIL, perms = "system:user:edit")
private String email;
/**
* 身份证号码
*/
private String idCard;
/**
* 手机号码
*/
@Sensitive(strategy = SensitiveStrategy.PHONE, perms = "system:user:edit")
private String phonenumber;
/**
* 用户性别(0男 1女 2未知)
*/
private String sex;
/**
* 头像地址
*/
@Translation(type = TransConstant.OSS_ID_TO_URL)
private Long avatar;
/**
* 备注
*/
private String remark;
/**
* 部门名
*/
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
private String deptName;
}
...@@ -26,6 +26,9 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> { ...@@ -26,6 +26,9 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
}) })
Page<SysUserVo> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper); Page<SysUserVo> selectPageUserList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
Page<SysUserVo> selectPageUserFullList(@Param("page")Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> buildQueryWrapper);
@DataPermission({ @DataPermission({
@DataColumn(key = "deptName", value = "dept_id"), @DataColumn(key = "deptName", value = "dept_id"),
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "user_id")
...@@ -87,5 +90,4 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> { ...@@ -87,5 +90,4 @@ public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
@DataColumn(key = "userName", value = "user_id") @DataColumn(key = "userName", value = "user_id")
}) })
int updateById(@Param(Constants.ENTITY) SysUser user); int updateById(@Param(Constants.ENTITY) SysUser user);
} }
...@@ -19,6 +19,11 @@ public interface ISysUserService { ...@@ -19,6 +19,11 @@ public interface ISysUserService {
TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery); TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery);
/**
* 查询所有数据
*/
TableDataInfo<SysUserVo> selectPageUserFullList(SysUserBo user, PageQuery pageQuery);
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
......
...@@ -68,6 +68,12 @@ public class SysUserServiceImpl implements ISysUserService { ...@@ -68,6 +68,12 @@ public class SysUserServiceImpl implements ISysUserService {
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }
@Override
public TableDataInfo<SysUserVo> selectPageUserFullList(SysUserBo user, PageQuery pageQuery) {
Page<SysUserVo> page = baseMapper.selectPageUserFullList(pageQuery.build(), this.buildQueryWrapper(user));
return TableDataInfo.build(page);
}
/** /**
* 根据条件分页查询用户列表 * 根据条件分页查询用户列表
* *
......
...@@ -24,6 +24,19 @@ ...@@ -24,6 +24,19 @@
${ew.getCustomSqlSegment} ${ew.getCustomSqlSegment}
</select> </select>
<select id="selectPageUserFullList" resultType="org.dromara.system.domain.vo.SysUserVo">
select
<if test="ew.getSqlSelect != null">
${ew.getSqlSelect}
</if>
<if test="ew.getSqlSelect == null">
u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.id_card, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
</if>
from sys_user u
${ew.getCustomSqlSegment}
</select>
<select id="selectUserList" resultMap="SysUserResult"> <select id="selectUserList" resultMap="SysUserResult">
select select
<if test="ew.getSqlSelect != null"> <if test="ew.getSqlSelect != null">
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论