diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java index 6cc47f05..d96e2b62 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java @@ -46,11 +46,9 @@ public interface AppGroupConverter { * * @return {@link Predicate} */ - default Predicate queryPredicate() { + default Predicate getQueryPredicate() { QAppGroupEntity appGroup = QAppGroupEntity.appGroupEntity; - Predicate predicate = ExpressionUtils.and(appGroup.isNotNull(), appGroup.deleted.eq(Boolean.FALSE)); - //@formatter:on - return predicate; + return ExpressionUtils.and(appGroup.isNotNull(), appGroup.deleted.eq(Boolean.FALSE)); } /** diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/result/AppGroupListResult.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/result/AppGroupListResult.java index 6af11084..7add0ef0 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/result/AppGroupListResult.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/result/AppGroupListResult.java @@ -41,7 +41,7 @@ public class AppGroupListResult implements Serializable { * 应用分组ID */ @Schema(description = "应用分组ID") - private Long id; + private String id; /** * 应用分组名称 diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java index ee166d24..a034c654 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java @@ -71,7 +71,7 @@ public class AppServiceImpl implements AppService { */ @Override public List getAppGroupList() { - Predicate predicate = appGroupConverter.queryPredicate(); + Predicate predicate = appGroupConverter.getQueryPredicate(); Predicate appGroupAssociationPredicate = appGroupConverter .queryAppGroupAssociationPredicate(); List appGroupAssociationList = (List) appGroupAssociationRepository