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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-04-25 17:15:11 +08:00
parent 7883e63817 8b7c9076b7
commit 862c82faa3
6 changed files with 136 additions and 83 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
+4 -3
View File
@@ -1471,7 +1471,7 @@ public class SysUserController {
name = "/%";
}
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.like(SysUser::getRealname,name);
lambdaQueryWrapper.like(SysUser::getUsername,name);
List<SysUser> sysUserList = sysUserService.list(lambdaQueryWrapper);
LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
@@ -1491,7 +1491,7 @@ public class SysUserController {
for (SysUser sysUser : sysUserList) {
SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
sysUserDepartVO.setKey(sysUser.getId());
sysUserDepartVO.setTitle(sysUser.getRealname());
sysUserDepartVO.setTitle(sysUser.getUsername());
list.add(sysUserDepartVO);
}
}
@@ -1526,7 +1526,8 @@ public class SysUserController {
SysDepartUserTreeModel target = new SysDepartUserTreeModel();
BeanUtils.copyProperties(sysUser, target);
target.setKey(sysUser.getId());
target.setTitle(sysUser.getRealname()+"("+sysUser.getUsername()+")");
target.setTitle(sysUser.getUsername());
// target.setTitle(sysUser.getRealname()+"("+sysUser.getUsername()+")");
target.setChildren(null);
target.setIsLeaf(true);
treeList.add(target);