|
@@ -40,7 +40,9 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
|
|
}
|
|
}
|
|
LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
|
|
wrapper.eq(Dict::getDictKey,dictKey);
|
|
wrapper.eq(Dict::getDictKey,dictKey);
|
|
- wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|
|
|
|
|
|
+ if(!StpUtil.hasRole("admin-super")){
|
|
|
|
+ wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|
|
|
|
+ }
|
|
wrapper.orderByAsc(Dict::getSort);
|
|
wrapper.orderByAsc(Dict::getSort);
|
|
wrapper.orderByDesc(Dict::getId);
|
|
wrapper.orderByDesc(Dict::getId);
|
|
return list(wrapper);
|
|
return list(wrapper);
|
|
@@ -56,7 +58,9 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
|
|
if(StringUtils.isNotBlank(param.getDictName())){
|
|
if(StringUtils.isNotBlank(param.getDictName())){
|
|
wrapper.like(Dict::getDictName,param.getDictName());
|
|
wrapper.like(Dict::getDictName,param.getDictName());
|
|
}
|
|
}
|
|
- wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|
|
|
|
|
|
+ if(!StpUtil.hasRole("admin-super")){
|
|
|
|
+ wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|
|
|
|
+ }
|
|
wrapper.orderByAsc(Dict::getSort);
|
|
wrapper.orderByAsc(Dict::getSort);
|
|
wrapper.orderByDesc(Dict::getId);
|
|
wrapper.orderByDesc(Dict::getId);
|
|
Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
Page<Dict> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|