diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java index 714db00..5b22f82 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java @@ -380,8 +380,9 @@ public class RoleServiceImpl extends ServiceImpl implements Ro .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getPrjDir, true) - .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) - .or().eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)); + .and(wrapper -> wrapper.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) + .or() + .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code))); } }