QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:修改数据字典,用户管理导出

Browse Source
This commit is contained in:
sunzheng
2024-08-07 14:53:17 +08:00
parent c1c57d9dc6
commit 698595807f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+5 -1
View File
@@ -494,6 +494,11 @@ public class SysDictController {
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysDictPage> pageList = new ArrayList<>();
String selections = request.getParameter("selections");
if(!oConvertUtils.isEmpty(selections)){
queryWrapper.in("id",selections.split(","));
}
List<SysDict> sysDictList = sysDictService.list(queryWrapper);
for (SysDict dictMain : sysDictList) {
SysDictPage vo = new SysDictPage();
@@ -503,7 +508,6 @@ public class SysDictController {
vo.setSysDictItemList(sysDictItemList);
pageList.add(vo);
}
// 导出文件名称
mv.addObject(JeroController.FILE_NAME, "数据字典");
// 注解对象Class
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+11 -3
View File
@@ -544,7 +544,15 @@ public class SysUserController {
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
// Step.1 组装查询条件
String departId = request.getParameter("departId");
String roleId = request.getParameter("roleId");
String groupId = request.getParameter("groupId");
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
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//update-begin--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
@@ -553,7 +561,9 @@ public class SysUserController {
queryWrapper.in("id",Arrays.asList(selections.split(",")));
}
//update-end--Author:kangxiaolin Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
List<SysUser> pageList = sysUserService.list(queryWrapper);
queryWrapper.ne("username", "admin");
IPage<SysUser> sysUserIPage = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
List<SysUser> pageList = sysUserIPage.getRecords();
if(!CollectionUtils.isEmpty(pageList)){
//批量查询用户的所属部门
//step.1 先拿到全部的 useids
@@ -566,8 +576,6 @@ public class SysUserController {
pageList.forEach(item->{
item.setOrgCodeTxt(useDepNames.get(item.getId()));
item.setRoleTxt(useRoleNames.get(item.getId()));
// 对手机号、邮箱进行解密处理
sysUserService.proceedUserInfoDecrypt(item);
});
}