diff --git a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java index 722eb00..dd4eabd 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java @@ -83,7 +83,8 @@ public class UserAccountController { QueryWrapper qw = new QueryWrapper<>(); qw.eq(param.getStatus() != null, "t1.status", param.getStatus()); qw.like(param.getName() != null, "t2.name", param.getName()); - qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId()); +// qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId()); + qw.inSql(param.getDepartmentId() != null,"t2.openid","SELECT openid from qywxDepartmentUserLink WHERE qywxDepartmentUserLink.departmentId = "+param.getDepartmentId()); qw.orderByDesc("updateAt", "creatAt"); return Result.success(userAccountService.listAll(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); } diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml index fb62ad9..51da7c9 100644 --- a/src/main/resources/mapper/VideoMapper.xml +++ b/src/main/resources/mapper/VideoMapper.xml @@ -1,6 +1,6 @@ - +