|
@@ -3,6 +3,7 @@ package com.ankaibei.workFlow.webadmin.upms.service.impl;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.ankaibei.workFlow.webadmin.upms.vo.SysUserVo;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.*;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.ankaibei.workFlow.webadmin.upms.service.*;
|
|
@@ -18,6 +19,7 @@ import com.ankaibei.workFlow.common.core.util.MyModelUtil;
|
|
|
import com.ankaibei.workFlow.common.sequence.wrapper.IdGeneratorWrapper;
|
|
|
import com.github.pagehelper.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -259,12 +261,22 @@ public class SysUserServiceImpl extends BaseService<SysUser, String> implements
|
|
|
* @return 查询结果集。
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<SysUser> getSysUserListWithRelation(SysUser filter) {
|
|
|
- List<SysUser> resultList = sysUserMapper.getSysUserList(filter);
|
|
|
+ public List<SysUserVo> getSysUserListWithRelation(SysUser filter) {
|
|
|
+ List<SysUser> list = sysUserMapper.getSysUserList(filter);
|
|
|
+ List<SysUserVo> resultList = new ArrayList<>();
|
|
|
// 在缺省生成的代码中,如果查询结果resultList不是Page对象,说明没有分页,那么就很可能是数据导出接口调用了当前方法。
|
|
|
// 为了避免一次性的大量数据关联,规避因此而造成的系统运行性能冲击,这里手动进行了分批次读取,开发者可按需修改该值。
|
|
|
- int batchSize = resultList instanceof Page ? 0 : 1000;
|
|
|
- this.buildRelationForDataList(resultList, MyRelationParam.normal(), batchSize);
|
|
|
+ int batchSize = list instanceof Page ? 0 : 1000;
|
|
|
+ this.buildRelationForDataList(list, MyRelationParam.normal(), batchSize);
|
|
|
+ for (SysUser user : list) {
|
|
|
+ SysUserVo userVo = new SysUserVo();
|
|
|
+ BeanUtils.copyProperties(user, userVo);
|
|
|
+ userVo.setUserId(user.getUserId() + "");
|
|
|
+ userVo.setDeptId(user.getDeptId() + "");
|
|
|
+ userVo.setCreateUserId(user.getCreateUserId() + "");
|
|
|
+ userVo.setUpdateUserId(user.getUpdateUserId() + "");
|
|
|
+ resultList.add(userVo);
|
|
|
+ }
|
|
|
return resultList;
|
|
|
}
|
|
|
|