|
@@ -222,7 +222,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
|
List<UserTreeVO> children = new ArrayList<>();
|
|
|
|
|
|
- dept.getChildren().forEach(d -> children.add(getChildren(d)));
|
|
|
+ dept.getChildren().forEach(d -> children.add(getChildren(d, users)));
|
|
|
|
|
|
userService.selectUserListByDeptId(dept.getDeptId()).forEach(u -> {
|
|
|
if (users.contains(u.getUserId())) {
|
|
@@ -284,7 +284,7 @@ public class SysUserController extends BaseController {
|
|
|
* 根据用户编号获取详细信息
|
|
|
*/
|
|
|
@PreAuthorize("@ss.hasPermi('system:user:query')")
|
|
|
- @GetMapping(value = {"/", "/{userId}"})
|
|
|
+ @GetMapping(value = {"/{userId}"})
|
|
|
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
|
|
userService.checkUserDataScope(userId);
|
|
|
AjaxResult ajax = AjaxResult.success();
|