1、发布工具权限逻辑调整

tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/ToolController.java

@@ -8,6 +8,7 @@ import com.rzdata.common.annotation.Log;
 import com.rzdata.common.constant.Constants;
 import com.rzdata.common.core.controller.BaseController;
 import com.rzdata.common.core.domain.AjaxResult;
+import com.rzdata.common.core.domain.entity.SysUser;
 import com.rzdata.common.core.page.TableDataInfo;
 import com.rzdata.common.enums.BusinessType;
 import com.rzdata.common.enums.RecordStatusEnum;
@@ -29,7 +30,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 工具信息Controller
@@ -72,10 +72,13 @@ public class ToolController extends BaseController
         if (BooleanUtil.isTrue(tool.getDownloadCheck())) {
             String userId = SecurityUtils.getUserId().toString();
             for (Tool vo:list) {
-                //已发布的工具 是创建人 或者 配置了下载权限 或者 通过了使用申请的
-                vo.setDownloadStatus(RecordStatusEnum.DONE.getCode().equals(vo.getRecordStatus())&&
-                        (userId.equals(vo.getCreateBy())||
-                        SecurityUtils.hasPermi(Constants.DOWNLOAD_TOOL_PERMISSION)||
+                //创建人、下载权限、系统管理员
+                //1.已经审核通过、并且有下载权限
+                vo.setDownloadStatus(
+                        userId.equals(vo.getCreateBy())||
+                                SysUser.isAdmin(SecurityUtils.getUserId()) ||
+                                SecurityUtils.hasPermi(Constants.DOWNLOAD_TOOL_PERMISSION) ||
+                                ( RecordStatusEnum.DONE.getCode().equals(vo.getRecordStatus())&&
                         iToolApplyService.checkToolApply(vo.getToolId(),userId)));
             }
         }

tool-tech-admin/src/main/java/com/rzdata/web/controller/tool/TzMessageController.java

@@ -71,7 +71,6 @@ public class TzMessageController extends BaseController
     /**
      * 新增消息
      */
-    @PreAuthorize("@ss.hasPermi('system:message:add')")
     @Log(title = "消息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TzMessage tzMessage)

tool-tech-admin/src/main/java/com/rzdata/web/service/impl/ToolApplyServiceImpl.java

@@ -1,6 +1,8 @@
 package com.rzdata.web.service.impl;
 
 import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.BooleanUtil;
+import com.rzdata.common.constant.Constants;
 import com.rzdata.common.core.domain.entity.SysUser;
 import com.rzdata.common.utils.DateUtils;
 import com.rzdata.common.utils.SecurityUtils;
@@ -67,6 +69,11 @@ public class ToolApplyServiceImpl implements IToolApplyService
     @Override
     public List<ToolApply> selectToolApplyList(ToolApply toolApply)
     {
+        if(!SysUser.isAdmin(SecurityUtils.getUserId())){
+           if(!SecurityUtils.hasPermi(Constants.APPLY_VIEW_ALL_PERMISSION)){
+                toolApply.setCreateBy(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
+            }
+        }
         return toolApplyMapper.selectToolApplyList(toolApply);
     }
 

tool-tech-admin/src/main/java/com/rzdata/web/service/impl/ToolServiceImpl.java

@@ -101,7 +101,7 @@ public class ToolServiceImpl implements IToolService
      * @return 工具信息
      */
     @Override
-    @DataScope(deptAlias = "d")
+    @DataScope(deptAlias = "d", userAlias = "su")
     public List<Tool> selectToolList(Tool tool)
     {
         if (BooleanUtil.isTrue(tool.getPermissionCheck())) {