|
@@ -53,7 +53,8 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, CategoryEntity
|
|
private CategoryCacheService categoryCacheService;
|
|
private CategoryCacheService categoryCacheService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<CategoryVO> listTeaching(LoginUser user) {
|
|
|
|
|
|
+ public List<CategoryVO> listTeaching(LoginUser user, Boolean flag) {
|
|
|
|
+ flag = flag != null && flag;
|
|
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
|
|
QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
|
|
LambdaQueryWrapper<CategoryEntity> lw = wrapper.lambda();
|
|
LambdaQueryWrapper<CategoryEntity> lw = wrapper.lambda();
|
|
List<CategoryEntity> categoryList = new ArrayList<>();
|
|
List<CategoryEntity> categoryList = new ArrayList<>();
|
|
@@ -61,6 +62,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryDao, CategoryEntity
|
|
if (user.getRole().equals(Role.ADMIN)) {
|
|
if (user.getRole().equals(Role.ADMIN)) {
|
|
lw.eq(CategoryEntity::getEnable, Boolean.TRUE);
|
|
lw.eq(CategoryEntity::getEnable, Boolean.TRUE);
|
|
lw.eq(CategoryEntity::getLevel, CategoryLevel.TEACHING.getValue());
|
|
lw.eq(CategoryEntity::getLevel, CategoryLevel.TEACHING.getValue());
|
|
|
|
+ lw.eq(flag, CategoryEntity::getEnable, Boolean.TRUE);
|
|
categoryList = this.getBaseMapper().selectList(wrapper);
|
|
categoryList = this.getBaseMapper().selectList(wrapper);
|
|
} else if (user.getRole().equals(Role.TEACHING)) { // 教学点管理员
|
|
} else if (user.getRole().equals(Role.TEACHING)) { // 教学点管理员
|
|
lw.eq(CategoryEntity::getId, user.getCategoryId());
|
|
lw.eq(CategoryEntity::getId, user.getCategoryId());
|