|
@@ -86,10 +86,11 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
|
|
|
QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
|
|
|
sysPrivilegeQueryWrapper.lambda()
|
|
|
.ne(SysPrivilege::getType, PrivilegeEnum.URL)
|
|
|
- .eq(SysPrivilege::getDisplay, true);
|
|
|
- if(Objects.isNull(schoolId)){
|
|
|
+ .eq(SysPrivilege::getDisplay, true)
|
|
|
+ .eq(SysPrivilege::getEnable, true);
|
|
|
+ if (Objects.isNull(schoolId)) {
|
|
|
sysPrivilegeQueryWrapper.lambda().isNull(SysPrivilege::getSchoolId);
|
|
|
- } else{
|
|
|
+ } else {
|
|
|
sysPrivilegeQueryWrapper.lambda().eq(SysPrivilege::getSchoolId, schoolId);
|
|
|
}
|
|
|
List<SysPrivilege> sysPrivilegeList = this.list(sysPrivilegeQueryWrapper);
|