绘图

src/main/java/com/fdkankan/fusion/service/impl/DictServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -48,7 +49,8 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
             String deptId = (String)StpUtil.getExtra("deptId");
             List<TmUser> byDeptId = tmUserService.getByDeptId(deptId);
             if(byDeptId !=null && !byDeptId.isEmpty()){
-                wrapper.and(e -> e.in(Dict::getSysUserId,byDeptId).or().eq(Dict::getUseType,"animation"));
+                List<String> collect = byDeptId.stream().map(TmUser::getUserName).collect(Collectors.toList());
+                wrapper.and(e -> e.in(Dict::getSysUserId,collect).or().eq(Dict::getUseType,"animation"));
             }else {
                 wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
             }