|
@@ -49,7 +49,7 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
|
|
String deptId = (String)StpUtil.getExtra("deptId");
|
|
String deptId = (String)StpUtil.getExtra("deptId");
|
|
List<TmUser> byDeptId = tmUserService.getByDeptId(deptId);
|
|
List<TmUser> byDeptId = tmUserService.getByDeptId(deptId);
|
|
if(byDeptId !=null && !byDeptId.isEmpty()){
|
|
if(byDeptId !=null && !byDeptId.isEmpty()){
|
|
- List<String> collect = byDeptId.stream().map(TmUser::getUserName).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> collect = byDeptId.stream().map(TmUser::getId).collect(Collectors.toList());
|
|
wrapper.and(e -> e.in(Dict::getSysUserId,collect).or().eq(Dict::getUseType,"animation"));
|
|
wrapper.and(e -> e.in(Dict::getSysUserId,collect).or().eq(Dict::getUseType,"animation"));
|
|
}else {
|
|
}else {
|
|
wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|
|
wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
|