dzx преди 1 година
родител
ревизия
4f5f86d6af

+ 1 - 0
src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -221,6 +221,7 @@ public class UserController {
                             .select(User::getId)
                             .select(User.class, x -> VoToColumnUtil.fieldsToColumns(UserPageVo.class).contains(x.getProperty()))
                             .leftJoin(UserRoleRelation.class, UserRoleRelation::getUserId, User::getId)
+                            .leftJoin(UserDeptRelation.class, UserDeptRelation::getUserId, User::getId)
                             .leftJoin(Role.class, Role::getId, UserRoleRelation::getRoleId);
             IPage<UserPageVo> page = userService.selectJoinListPage(ConventPage.getPage(dto), UserPageVo.class,queryUser);
             for (UserPageVo record : page.getRecords()) {

+ 1 - 0
src/main/java/com/xjrsoft/module/organization/dto/UserPageDto.java

@@ -36,6 +36,7 @@ public class UserPageDto extends PageInput {
 
     @ApiModelProperty("树类型")
     private Integer treeType;
+
     @ApiModelProperty("树id")
     private Long treeId;
 }