diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java index 15637d1a..2bf6cac8 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/app/impl/AppGroupRepositoryCustomizedImpl.java @@ -54,35 +54,19 @@ public class AppGroupRepositoryCustomizedImpl implements AppGroupRepositoryCusto @Override public Page getAppGroupList(AppGroupQuery query, Pageable pageable) { //@formatter:off - StringBuilder builder = new StringBuilder(""" - SELECT - `group`.id_, - `group`.name_, - `group`.code_, - `group`.type_, - `group`.create_time, - `group`.remark_, - IFNULL( ass.app_count, 0 ) AS app_count - FROM - app_group `group` - LEFT JOIN ( SELECT group_id, count(*) AS `app_count` FROM app_group_association GROUP BY group_id ) ass ON `group`.id_ = ass.group_id - WHERE is_deleted = '0' - """); + StringBuilder builder = new StringBuilder("SELECT `group`.id_, `group`.name_, `group`.code_, `group`.type_, `group`.create_time, `group`.remark_, IFNULL( ass.app_count, 0) AS app_count FROM app_group `group` LEFT JOIN(SELECT aga.group_id, COUNT(*) AS `app_count` FROM app_group_association aga INNER JOIN app ON aga.app_id = app.id_ AND app.is_deleted = 0 GROUP BY aga.group_id ) ass ON `group`.id_ = ass.group_id WHERE is_deleted = '0'"); //分组名称 if (StringUtils.isNoneBlank(query.getName())) { builder.append(" AND `group`.name_ like '%").append(query.getName()).append("%'"); } - //分组编码 if (StringUtils.isNoneBlank(query.getCode())) { builder.append(" AND `group`.code_ like '%").append(query.getCode()).append("%'"); } - //分组类型 if (ObjectUtils.isNotEmpty(query.getType())) { builder.append(" AND `group`.type_ like '%").append(query.getType().getCode()).append("%'"); } - builder.append(" ORDER BY `group`.create_time DESC"); //@formatter:on String sql = builder.toString();