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

优化

pull/47/head
shao1121353141 2023-09-13 16:14:17 +08:00
parent a5ca4e2dad
commit 3f7e26aed9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ package cn.topiam.employee.portal.converter;
import java.util.ArrayList;
import java.util.List;
import com.querydsl.core.types.ExpressionUtils;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
@ -47,7 +48,7 @@ public interface AppGroupConverter {
*/
default Predicate queryPredicate() {
QAppGroupEntity appGroup = QAppGroupEntity.appGroupEntity;
Predicate predicate = appGroup.deleted.eq(Boolean.FALSE);
Predicate predicate = ExpressionUtils.and(appGroup.isNotNull(), appGroup.deleted.eq(Boolean.FALSE));
//@formatter:on
return predicate;
}
@ -59,7 +60,7 @@ public interface AppGroupConverter {
*/
default Predicate queryAppGroupAssociationPredicate() {
QAppGroupAssociationEntity appGroupAssociation = QAppGroupAssociationEntity.appGroupAssociationEntity;
return appGroupAssociation.deleted.eq(Boolean.FALSE);
return ExpressionUtils.and(appGroupAssociation.isNotNull(), appGroupAssociation.deleted.eq(Boolean.FALSE));
}
/**