ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:修改用户管理添加组织机构,角色后导出数据为全部数据的bug

Browse Source
This commit is contained in:
sunzheng
2024-08-07 14:34:08 +08:00
parent 4cb24550d3
commit 4c5b521626
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+14 -8
View File
@@ -537,17 +537,27 @@ public class SysUserController {
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) { public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
// Step.1 组装查询条件 // Step.1 组装查询条件
String departId = request.getParameter("departId");
String roleId = request.getParameter("roleId");
String groupId = request.getParameter("groupId");
sysUser.setPhone(this.sysUserService.proceedPhoneEncrypt(sysUser.getPhone()));
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap()); QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
Page<SysUser> page = new Page<>(-1, -1);
List<String> subDepIds = null;
if (StrUtil.isNotEmpty(departId)){
subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
}
//Step.2 AutoPoi 导出Excel //Step.2 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据-------------------- //update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
String selections = request.getParameter("selections"); String selections = request.getParameter("selections");
if(!oConvertUtils.isEmpty(selections)){ if(!oConvertUtils.isEmpty(selections)){
queryWrapper.in("id",Arrays.asList(selections.split(","))); queryWrapper.in("id",Arrays.asList(selections.split(",")));
} }
//update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据---------------------- //update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
queryWrapper.ne("username", "admin"); queryWrapper.ne("username", "admin");
List<SysUser> pageList = sysUserService.list(queryWrapper); IPage<SysUser> sysUserIPage = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
List<SysUser> pageList = sysUserIPage.getRecords();
if(!CollectionUtils.isEmpty(pageList)){ if(!CollectionUtils.isEmpty(pageList)){
//批量查询用户的所属部门 //批量查询用户的所属部门
//step.1 先拿到全部的 useids //step.1 先拿到全部的 useids
@@ -560,13 +570,9 @@ public class SysUserController {
pageList.forEach(item->{ pageList.forEach(item->{
item.setOrgCodeTxt(useDepNames.get(item.getId())); item.setOrgCodeTxt(useDepNames.get(item.getId()));
item.setRoleTxt(useRoleNames.get(item.getId())); item.setRoleTxt(useRoleNames.get(item.getId()));
// 对手机号、邮箱进行解密处理
sysUserService.proceedUserInfoDecrypt(item);
}); });
} }
//导出文件名称 //导出文件名称
mv.addObject(JeroController.FILE_NAME, "用户列表"); mv.addObject(JeroController.FILE_NAME, "用户列表");
mv.addObject(JeroController.CLASS, SysUser.class); mv.addObject(JeroController.CLASS, SysUser.class);