lyhzzz 3 месяцев назад
Родитель
Сommit
fe44bf9d4b

+ 8 - 1
src/main/java/com/fdkankan/fusion/service/impl/DictServiceImpl.java

@@ -71,7 +71,14 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
             wrapper.like(Dict::getDictName,param.getDictName());
         }
         if(!StpUtil.hasRole("admin-super")){
-            wrapper.and(e -> e.eq(Dict::getSysUserId,StpUtil.getLoginId()).or().eq(Dict::getUseType,"animation"));
+            String deptId = (String)StpUtil.getExtra("deptId");
+            List<TmUser> byDeptId = tmUserService.getByDeptId(deptId);
+            if(byDeptId !=null && !byDeptId.isEmpty()){
+                List<String> collect = byDeptId.stream().map(TmUser::getId).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"));
+            }
         }
         wrapper.orderByAsc(Dict::getSort);
         wrapper.orderByDesc(Dict::getId);