gitee/snowy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

【更新】使用easy trans 和 typehandel来替代 传统的join表和加解密

Browse Source
This commit is contained in:
wanglei 2022-09-30 18:07:03 +08:00
parent f34d074d00
commit 7c14e6c93f
9 changed files with 144 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java
View File

@ -15,6 +15,7 @@ package vip.xiaonuo.sys.modular.org.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fhs.core.trans.vo.TransPojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -29,7 +30,7 @@ import vip.xiaonuo.common.pojo.CommonEntity;
@Getter
@Setter
@TableName("SYS_ORG")
public class SysOrg extends CommonEntity {
public class SysOrg extends CommonEntity implements TransPojo {
/** id */
@ApiModelProperty(value = "id", position = 1)

3
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/entity/SysPosition.java
View File

@ -15,6 +15,7 @@ package vip.xiaonuo.sys.modular.position.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fhs.core.trans.vo.TransPojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
@ -29,7 +30,7 @@ import vip.xiaonuo.common.pojo.CommonEntity;
@Getter
@Setter
@TableName("SYS_POSITION")
public class SysPosition extends CommonEntity {
public class SysPosition extends CommonEntity implements TransPojo {
/** id */
@ApiModelProperty(value = "id", position = 1)

5
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java
View File

@ -19,6 +19,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -59,6 +60,7 @@ public class SysUserController {
@Resource
private SysUserService sysUserService;
/**
* 获取用户分页
*
@ -67,9 +69,8 @@ public class SysUserController {
*/
@ApiOperationSupport(order = 1)
@ApiOperation("获取用户分页")
@CommonWrapper(SysUserResultWrapperImpl.class)
@GetMapping("/sys/user/page")
public CommonResult<Page<SysUserResult>> page(SysUserPageParam sysUserPageParam) {
public CommonResult<Page<SysUser>> page(SysUserPageParam sysUserPageParam) {
return CommonResult.data(sysUserService.page(sysUserPageParam));
}

38
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java
View File

@ -14,11 +14,18 @@ package vip.xiaonuo.sys.modular.user.entity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fhs.core.trans.anno.Trans;
import com.fhs.core.trans.constant.TransType;
import com.fhs.core.trans.vo.TransPojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import vip.xiaonuo.common.handler.Sm4CbcTypeHandler;
import vip.xiaonuo.common.pojo.CommonEntity;
import vip.xiaonuo.sys.modular.org.entity.SysOrg;
import vip.xiaonuo.sys.modular.position.entity.SysPosition;
import java.util.Date;
@ -30,10 +37,11 @@ import java.util.Date;
**/
@Getter
@Setter
@TableName("SYS_USER")
public class SysUser extends CommonEntity {
@TableName(value = "SYS_USER",autoResultMap = true)
public class SysUser extends CommonEntity implements TransPojo {
/** id */
@TableId
@ApiModelProperty(value = "id", position = 1)
private String id;
@ -67,6 +75,7 @@ public class SysUser extends CommonEntity {
/** 性别 */
@ApiModelProperty(value = "性别", position = 8)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@Trans(type= TransType.DICTIONARY,key = "GENDER")
private String gender;
/** 年龄 */
@ -106,7 +115,7 @@ public class SysUser extends CommonEntity {
/** 证件号码 */
@ApiModelProperty(value = "证件号码", position = 16)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED,typeHandler = Sm4CbcTypeHandler.class)
private String idCardNumber;
/** 文化程度 */
@ -141,7 +150,7 @@ public class SysUser extends CommonEntity {
/** 手机 */
@ApiModelProperty(value = "手机", position = 23)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED,typeHandler = Sm4CbcTypeHandler.class)
private String phone;
/** 邮箱 */
@ -166,7 +175,7 @@ public class SysUser extends CommonEntity {
/** 紧急联系人电话 */
@ApiModelProperty(value = "紧急联系人电话", position = 28)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED,typeHandler = Sm4CbcTypeHandler.class)
private String emergencyPhone;
/** 紧急联系人地址 */
@ -187,11 +196,14 @@ public class SysUser extends CommonEntity {
/** 组织id */
@ApiModelProperty(value = "组织id", position = 32)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@Trans(type=TransType.SIMPLE,target = SysOrg.class,fields = "name",alias = "org",ref = "orgName")
private String orgId;
/** 职位id */
@ApiModelProperty(value = "职位id", position = 33)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@Trans(type=TransType.SIMPLE,target = SysPosition.class,fields = "name",alias = "position",ref = "positionName")
private String positionId;
/** 职级 */
@ -202,6 +214,7 @@ public class SysUser extends CommonEntity {
/** 主管id */
@ApiModelProperty(value = "主管id", position = 35)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
@Trans(type=TransType.SIMPLE,target = SysUser.class,fields = "name",alias = "director",ref = "directorName")
private String directorId;
/** 兼任信息 */
@ -253,4 +266,19 @@ public class SysUser extends CommonEntity {
@ApiModelProperty(value = "扩展信息", position = 47)
@TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
private String extJson;
@ApiModelProperty(value = "组织名称", position = 48)
@TableField(exist = false)
private String orgName;
@ApiModelProperty(value = "组织名称", position = 49)
@TableField(exist = false)
private String positionName;
@ApiModelProperty(value = "主管名称", position = 50)
@TableField(exist = false)
private String directorName;
}

14
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/mapper/SysUserMapper.java
View File

@ -30,19 +30,5 @@ import java.util.List;
**/
public interface SysUserMapper extends BaseMapper<SysUser> {
/**
* 获取用户分页列表
*
* @author xuyuxiang
* @date 2022/7/8 13:27
**/
Page<SysUserResult> page(@Param("page") Page<SysUserResult> page, @Param("ew") QueryWrapper<SysUserResult> queryWrapper);
/**
* 获取要导出的用户列表
*
* @author xuyuxiang
* @date 2022/7/8 13:27
**/
List<SysUserExportResult> exportList(@Param("ew") QueryWrapper<SysUserExportResult> queryWrapper);
}

28
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/mapper/mapping/SysUserMapper.xml
View File

@ -2,31 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="vip.xiaonuo.sys.modular.user.mapper.SysUserMapper">
<!-- 获取用户分页 -->
<select id="page" resultType="vip.xiaonuo.sys.modular.user.result.SysUserResult">
SELECT
SYS_USER.*,
SYS_ORG.NAME AS ORG_NAME,
SYS_POSITION.NAME AS POSITION_NAME,
SYS_DIRECTOR.NAME AS DIRECTOR_NAME
FROM SYS_USER
LEFT JOIN SYS_USER SYS_DIRECTOR ON SYS_USER.ID = SYS_DIRECTOR.ID
LEFT JOIN SYS_ORG ON SYS_USER.ORG_ID = SYS_ORG.ID
LEFT JOIN SYS_POSITION ON SYS_USER.POSITION_ID = SYS_POSITION.ID
${ew.customSqlSegment}
</select>
<!-- 获取要导出的用户列表 -->
<select id="exportList" resultType="vip.xiaonuo.sys.modular.user.result.SysUserExportResult">
SELECT
SYS_USER.*,
SYS_ORG.NAME AS ORG_NAME,
SYS_POSITION.NAME AS POSITION_NAME,
SYS_DIRECTOR.NAME AS DIRECTOR_NAME
FROM SYS_USER
LEFT JOIN SYS_USER SYS_DIRECTOR ON SYS_USER.ID = SYS_DIRECTOR.ID
LEFT JOIN SYS_ORG ON SYS_USER.ORG_ID = SYS_ORG.ID
LEFT JOIN SYS_POSITION ON SYS_USER.POSITION_ID = SYS_POSITION.ID
${ew.customSqlSegment}
</select>
</mapper>

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/result/SysUserExportResult.java
View File

@ -44,7 +44,7 @@ public class SysUserExportResult {
private String name;
/** 昵称 */
@Excel(name = "姓名")
@Excel(name = "昵称")
private String nickname;
/** 性别 */

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
View File

@ -74,7 +74,7 @@ public interface SysUserService extends IService<SysUser> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
Page<SysUserResult> page(SysUserPageParam sysUserPageParam);
Page<SysUser> page(SysUserPageParam sysUserPageParam);
/**
* 添加用户

128
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -43,6 +43,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fhs.trans.service.impl.TransService;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -113,6 +114,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Resource
private DevSmsApi devSmsApi;
@Resource
private TransService transService;
@Resource
private DevEmailApi devEmailApi;
@ -144,23 +148,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public SysLoginUser getUserById(String id) {
SysUser sysUser = this.getById(id);
if (ObjectUtil.isNotEmpty(sysUser)) {
SysLoginUser sysLoginUser = BeanUtil.copyProperties(sysUser, SysLoginUser.class);
if(ObjectUtil.isNotEmpty(sysLoginUser.getOrgId())) {
sysLoginUser.setOrgName(sysOrgService.queryEntity(sysLoginUser.getOrgId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPositionId())) {
sysLoginUser.setPositionName(sysPositionService.queryEntity(sysLoginUser.getPositionId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPhone())) {
sysLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getPhone()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getIdCardNumber())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getIdCardNumber()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getEmergencyPhone())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getEmergencyPhone()));
}
return sysLoginUser;
transService.transOne(sysUser);
return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
}
return null;
}
@ -169,23 +158,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public SysLoginUser getUserByAccount(String account) {
SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getAccount, account));
if (ObjectUtil.isNotEmpty(sysUser)) {
SysLoginUser sysLoginUser = BeanUtil.copyProperties(sysUser, SysLoginUser.class);
if(ObjectUtil.isNotEmpty(sysLoginUser.getOrgId())) {
sysLoginUser.setOrgName(sysOrgService.queryEntity(sysLoginUser.getOrgId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPositionId())) {
sysLoginUser.setPositionName(sysPositionService.queryEntity(sysLoginUser.getPositionId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPhone())) {
sysLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getPhone()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getIdCardNumber())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getIdCardNumber()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getEmergencyPhone())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getEmergencyPhone()));
}
return sysLoginUser;
transService.transOne(sysUser);
return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
}
return null;
}
@ -194,23 +168,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public SysLoginUser getUserByPhone(String phone) {
SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(phone)));
if (ObjectUtil.isNotEmpty(sysUser)) {
SysLoginUser sysLoginUser = BeanUtil.copyProperties(sysUser, SysLoginUser.class);
if(ObjectUtil.isNotEmpty(sysLoginUser.getOrgId())) {
sysLoginUser.setOrgName(sysOrgService.queryEntity(sysLoginUser.getOrgId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPositionId())) {
sysLoginUser.setPositionName(sysPositionService.queryEntity(sysLoginUser.getPositionId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPhone())) {
sysLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getPhone()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getIdCardNumber())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getIdCardNumber()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getEmergencyPhone())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getEmergencyPhone()));
}
return sysLoginUser;
transService.transOne(sysUser);
return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
}
return null;
}
@ -219,66 +178,39 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public SysLoginUser getUserByEmail(String email) {
SysUser sysUser = this.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getEmail, email));
if (ObjectUtil.isNotEmpty(sysUser)) {
SysLoginUser sysLoginUser = BeanUtil.copyProperties(sysUser, SysLoginUser.class);
if(ObjectUtil.isNotEmpty(sysLoginUser.getOrgId())) {
sysLoginUser.setOrgName(sysOrgService.queryEntity(sysLoginUser.getOrgId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPositionId())) {
sysLoginUser.setPositionName(sysPositionService.queryEntity(sysLoginUser.getPositionId()).getName());
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getPhone())) {
sysLoginUser.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getPhone()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getIdCardNumber())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getIdCardNumber()));
}
if(ObjectUtil.isNotEmpty(sysLoginUser.getEmergencyPhone())) {
sysLoginUser.setIdCardNumber(CommonCryptogramUtil.doSm4CbcDecrypt(sysLoginUser.getEmergencyPhone()));
}
return sysLoginUser;
transService.transOne(sysUser);
return BeanUtil.copyProperties(sysUser, SysLoginUser.class);
}
return null;
}
@Override
public Page<SysUserResult> page(SysUserPageParam sysUserPageParam) {
QueryWrapper<SysUserResult> queryWrapper = new QueryWrapper<>();
public Page<SysUser> page(SysUserPageParam sysUserPageParam) {
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(sysUserPageParam.getSearchKey())) {
queryWrapper.and(q -> q.like("SYS_USER.ACCOUNT", sysUserPageParam.getSearchKey())
.or().like("SYS_USER.NAME", sysUserPageParam.getSearchKey()));
queryWrapper.and(q -> q.like("ACCOUNT", sysUserPageParam.getSearchKey())
.or().like("NAME", sysUserPageParam.getSearchKey()));
}
if (ObjectUtil.isNotEmpty(sysUserPageParam.getOrgId())) {
queryWrapper.eq("SYS_USER.ORG_ID", sysUserPageParam.getOrgId());
queryWrapper.eq("ORG_ID", sysUserPageParam.getOrgId());
}
if (ObjectUtil.isNotEmpty(sysUserPageParam.getUserStatus())) {
queryWrapper.eq("SYS_USER.USER_STATUS", sysUserPageParam.getUserStatus());
queryWrapper.eq("USER_STATUS", sysUserPageParam.getUserStatus());
}
if (ObjectUtil.isAllNotEmpty(sysUserPageParam.getSortField(), sysUserPageParam.getSortOrder())) {
CommonSortOrderEnum.validate(sysUserPageParam.getSortOrder());
queryWrapper.orderBy(true, sysUserPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
StrUtil.toUnderlineCase("SYS_USER." + sysUserPageParam.getSortField()));
StrUtil.toUnderlineCase(sysUserPageParam.getSortField()));
} else {
queryWrapper.orderByAsc("SYS_USER.SORT_CODE");
queryWrapper.orderByAsc("SORT_CODE");
}
return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
return this.baseMapper.selectPage(CommonPageRequest.defaultPage(), queryWrapper);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void add(SysUserAddParam sysUserAddParam) {
checkParam(sysUserAddParam);
// 设置手机号
if(ObjectUtil.isNotEmpty(sysUserAddParam.getPhone())) {
sysUserAddParam.setPhone(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserAddParam.getPhone()));
}
// 设置证件号
if(ObjectUtil.isNotEmpty(sysUserAddParam.getIdCardNumber())) {
sysUserAddParam.setIdCardNumber(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserAddParam.getIdCardNumber()));
}
// 设置紧急联系人电话
if(ObjectUtil.isNotEmpty(sysUserAddParam.getEmergencyPhone())) {
sysUserAddParam.setEmergencyPhone(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserAddParam.getEmergencyPhone()));
}
SysUser sysUser = BeanUtil.toBean(sysUserAddParam, SysUser.class);
if (ObjectUtil.isEmpty(sysUser.getAvatar())) {
// 设置默认头像
@ -321,18 +253,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public void edit(SysUserEditParam sysUserEditParam) {
SysUser sysUser = this.queryEntity(sysUserEditParam.getId());
checkParam(sysUserEditParam);
// 设置手机号
if(ObjectUtil.isNotEmpty(sysUserEditParam.getPhone())) {
sysUserEditParam.setPhone(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserEditParam.getPhone()));
}
// 设置证件号
if(ObjectUtil.isNotEmpty(sysUserEditParam.getIdCardNumber())) {
sysUserEditParam.setIdCardNumber(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserEditParam.getIdCardNumber()));
}
// 设置紧急联系人电话
if(ObjectUtil.isNotEmpty(sysUserEditParam.getEmergencyPhone())) {
sysUserEditParam.setEmergencyPhone(CommonCryptogramUtil.doSm4CbcEncrypt(sysUserEditParam.getEmergencyPhone()));
}
BeanUtil.copyProperties(sysUserEditParam, sysUser);
this.updateById(sysUser);
}
@ -922,7 +842,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public void exportUser(SysUserExportParam sysUserExportParam, HttpServletResponse response) throws IOException {
File tempFile = null;
try {
QueryWrapper<SysUserExportResult> queryWrapper = new QueryWrapper<>();
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(sysUserExportParam.getSearchKey())) {
queryWrapper.and(q -> q.like("SYS_USER.ACCOUNT", sysUserExportParam.getSearchKey())
.or().like("SYS_USER.NAME", sysUserExportParam.getSearchKey())
@ -932,7 +852,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
queryWrapper.eq("SYS_USER.STATUS", sysUserExportParam.getUserStatus());
}
String fileName = "SNOWY2.0系统B端用户信息清单";
List<SysUserExportResult> sysUserExportResultList = this.baseMapper.exportList(queryWrapper).stream().peek(sysUserExportResult -> {
List<SysUserExportResult> sysUserExportResultList = this.baseMapper.selectList(queryWrapper).stream().map(sysUser -> {
return BeanUtil.copyProperties(sysUser, SysUserExportResult.class);
}).peek(sysUserExportResult -> {
if (ObjectUtil.isNotEmpty(sysUserExportResult.getAvatar())) {
sysUserExportResult.setAvatarByte(ImgUtil.toBytes(ImgUtil.toImage(StrUtil
.split(sysUserExportResult.getAvatar(), StrUtil.COMMA).get(1)), ImgUtil.IMAGE_TYPE_PNG));