WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改用户管理搜索部门

Browse Source
This commit is contained in:
高嵩
2022-10-17 18:56:54 +08:00
parent 38105aaa7a
commit 71f2d1f90b
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+22 -2
View File
@@ -127,10 +127,24 @@ public class SysUserController {
public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
Result<IPage<SysUser>> result = new Result<IPage<SysUser>>();
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
Map<String, String[]> reqMap = req.getParameterMap();
Map<String, String[]> newReqMap = new HashMap<>();
for (String key : reqMap.keySet()){
if(!key.equals("orgCode")){
newReqMap.put(key,reqMap.get(key));
}
}
user.setOrgCode(null);
QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, newReqMap);
//TODO 外部模拟登陆临时账号，列表不显示
queryWrapper.ne("username", "_reserve_user_external");
Page<SysUser> page = new Page<SysUser>(pageNo, pageSize);
String[] orgCode = reqMap.get("orgCode");
if(null != orgCode && orgCode.length > 0){
List<String> orgCodeList = sysDepartService.getSubDepIdsByDepId(orgCode[0]);
orgCodeList.add(orgCode[0]);
queryWrapper.in("org_code",orgCodeList);
}
Page<SysUser> page = new Page<>(pageNo, pageSize);
IPage<SysUser> pageList = sysUserService.page(page, queryWrapper);
//批量查询用户的所属部门
@@ -1549,6 +1563,12 @@ public class SysUserController {
for (SysDepartTreeModel sdtm: departTreeModelList) {
dutList.addAll(findChildNode(sdtm));
}
SysUser admin = sysUserService.getUserByName("admin");
DepartUserTree dut = new DepartUserTree();
dut.setId(admin.getId());
dut.setName(admin.getUsername());
dut.setType("User");
dutList.add(dut);
result.setResult(dutList);
result.setSuccess(true);
return result;