diff --git a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java index aba3f5f..b6ebfc7 100644 --- a/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java +++ b/agt-module-system/agt-module-system-server/src/main/java/org/agt/module/system/dal/mysql/permission/RoleMapper.java @@ -1,11 +1,13 @@ package org.agt.module.system.dal.mysql.permission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.mybatis.core.dataobject.BaseDO; import org.agt.framework.mybatis.core.mapper.BaseMapperX; import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX; import org.agt.module.system.controller.admin.permission.vo.role.RolePageReqVO; import org.agt.module.system.dal.dataobject.permission.RoleDO; +import org.agt.module.system.enums.permission.RoleCodeEnum; import org.apache.ibatis.annotations.Mapper; import org.springframework.lang.Nullable; @@ -20,6 +22,7 @@ public interface RoleMapper extends BaseMapperX { .likeIfPresent(RoleDO::getName, reqVO.getName()) .likeIfPresent(RoleDO::getCode, reqVO.getCode()) .eqIfPresent(RoleDO::getStatus, reqVO.getStatus()) + .neIfPresent(RoleDO::getCode, RoleCodeEnum.SUPER_ADMIN.getCode()) .betweenIfPresent(BaseDO::getCreateTime, reqVO.getCreateTime()) .orderByAsc(RoleDO::getSort)); } @@ -33,7 +36,8 @@ public interface RoleMapper extends BaseMapperX { } default List selectListByStatus(@Nullable Collection statuses) { - return selectList(RoleDO::getStatus, statuses); + return selectList(Wrappers.lambdaQuery().eq(RoleDO::getStatus, statuses) + .ne(RoleDO::getCode, RoleCodeEnum.SUPER_ADMIN.getCode())); } }