绘图

doc/v1.9.0/fusion-1.9.0.sql

@@ -29,3 +29,4 @@ CREATE TABLE `t_case_path` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 
+UPDATE t_case_tag set hot_icon_id = 18 WHERE hot_icon_id = 1;

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

@@ -7,12 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.entity.Dict;
+import com.fdkankan.fusion.entity.TmUser;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.mapper.IDictMapper;
 import com.fdkankan.fusion.request.DictParam;
 import com.fdkankan.fusion.service.IDictFileService;
 import com.fdkankan.fusion.service.IDictService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.fusion.service.ITmUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,6 +34,8 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
 
     @Autowired
     IDictFileService dictFileService;
+    @Autowired
+    ITmUserService tmUserService;
 
     @Override
     public List<Dict> getByKey(String dictKey) {
@@ -41,7 +45,13 @@ public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements I
         LambdaQueryWrapper<Dict> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Dict::getDictKey,dictKey);
         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()){
+                wrapper.and(e -> e.in(Dict::getSysUserId,byDeptId).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);