gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化

pull/48/head
smallbun 2023-09-13 20:44:12 +08:00
parent cd9472e172
commit 4c473491f5
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eiam-portal/src/main/java/cn/topiam/employee/portal/converter/AppGroupConverter.java
View File

@ -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));
}
/**

2
eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/result/AppGroupListResult.java
View File

@ -41,7 +41,7 @@ public class AppGroupListResult implements Serializable {
* 应用分组ID
*/
@Schema(description = "应用分组ID")
private Long id;
private String id;
/**
* 应用分组名称

2
eiam-portal/src/main/java/cn/topiam/employee/portal/service/impl/AppServiceImpl.java
View File

@ -71,7 +71,7 @@ public class AppServiceImpl implements AppService {
*/
@Override
public List<AppGroupListResult> getAppGroupList() {
Predicate predicate = appGroupConverter.queryPredicate();
Predicate predicate = appGroupConverter.getQueryPredicate();
Predicate appGroupAssociationPredicate = appGroupConverter
.queryAppGroupAssociationPredicate();
List<AppGroupAssociationEntity> appGroupAssociationList = (List<AppGroupAssociationEntity>) appGroupAssociationRepository