diff --git a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java index 1f62f822..5954aa42 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java @@ -285,6 +285,6 @@ public class SysUserController { index.put("auditTeamName", sysAuditTeamDTOList.stream().findFirst().isPresent() ? sysAuditTeamDTOList.stream().findFirst().get().getName() : ""); return index; }).collect(Collectors.toList()); - return new Result>().ok(new PageData<>(temp, sysUserService.getUserByRoleListCount(roleId))); + return new Result>().ok(new PageData<>(temp, sysUserService.getUserByRoleListCount(roleId, filterAuditTeam))); } } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java b/renren-admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java index 509cb494..a3bbdf95 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/dao/SysUserDao.java @@ -59,5 +59,5 @@ public interface SysUserDao extends BaseDao { List getUserByRoleList(@Param("roleIds") List roleIds, @Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("filter") boolean filter); - Long getUserByRoleListCount(@Param("roleIds") List roleIds); + Long getUserByRoleListCount(@Param("roleIds") List roleIds, @Param("filter") boolean filter); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/SysUserService.java b/renren-admin/src/main/java/io/renren/modules/sys/service/SysUserService.java index 9dd3157d..a5e438f1 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/service/SysUserService.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/service/SysUserService.java @@ -74,5 +74,5 @@ public interface SysUserService extends BaseService { */ List getUserByRoleList(List roleIds, int pageNum, int pageSize, boolean filter); - Long getUserByRoleListCount(List roleIds); + Long getUserByRoleListCount(List roleIds, boolean filter); } diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java index cb85aff6..ef93af9a 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java @@ -568,7 +568,7 @@ public class SysUserServiceImpl extends BaseServiceImpl roleIds) { - return baseDao.getUserByRoleListCount(roleIds); + public Long getUserByRoleListCount(List roleIds, boolean filter) { + return baseDao.getUserByRoleListCount(roleIds, filter); } } diff --git a/renren-admin/src/main/resources/mapper/sys/SysUserDao.xml b/renren-admin/src/main/resources/mapper/sys/SysUserDao.xml index 808bcc08..cdf6dbdf 100644 --- a/renren-admin/src/main/resources/mapper/sys/SysUserDao.xml +++ b/renren-admin/src/main/resources/mapper/sys/SysUserDao.xml @@ -261,8 +261,32 @@ LIMIT ${pageNum}, ${pageSize}