代码优化

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/constant/DeptOssScope.java

+package org.dromara.system.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author wenhe
+ */
+@Getter
+@AllArgsConstructor
+public enum DeptOssScope {
+
+    COMPANY("company", "公司"),
+    DEPT("dept", "部门");
+
+    private String key;
+    private String value;
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptOssServiceImpl.java

@@ -7,6 +7,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.common.mybatis.service.AbstractBaseService;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.constant.DeptOssScope;
 import org.dromara.system.domain.SysDeptOss;
 import org.dromara.system.domain.bo.SysDeptOssBo;
 import org.dromara.system.domain.vo.SysDeptOssVo;
@@ -46,6 +47,12 @@ public class SysDeptOssServiceImpl extends AbstractBaseService<SysDeptOssVo, Sys
         lqw.eq(StringUtils.isNotBlank(bo.getScope()), SysDeptOss::getScope, bo.getScope());
         lqw.eq(Objects.nonNull(bo.getApprove()), SysDeptOss::getApprove, bo.getApprove());
         lqw.eq(bo.getOpen() != null, SysDeptOss::getOpen, bo.getOpen());
+        if (!LoginHelper.isSuperAdmin()) {
+            Long deptId = LoginHelper.getDeptId();
+            if (bo.getDeptId() != null && !Objects.equals(deptId, bo.getDeptId())) {
+                lqw.eq(SysDeptOss::getScope, DeptOssScope.COMPANY.getKey());
+            }
+        }
         return lqw;
     }
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java

@@ -409,6 +409,7 @@ public class ActTaskServiceImpl implements IActTaskService {
             List<String> processDefinitionIds = StreamUtils.toList(taskList, TaskVo::getProcessDefinitionId);
             List<WfNodeConfigVo> wfNodeConfigVoList = wfNodeConfigService.selectByDefIds(processDefinitionIds);
             for (TaskVo task : taskList) {
+                task.setEntity(getHistoricVariableByBusinessKey(task.getBusinessKey(), "entity"));
                 task.setBusinessStatusName(BusinessStatusEnum.findByStatus(task.getBusinessStatus()));
                 if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {
                     wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(task.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(task::setWfNodeConfigVo);

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FileApproveServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 部门文件下载申请Service业务层处理
@@ -56,6 +57,8 @@ public class FileApproveServiceImpl extends AbstractBaseService<FileApproveVo, F
         lqw.eq(StringUtils.isNotBlank(bo.getPurpose()), FileApprove::getPurpose, bo.getPurpose());
         lqw.eq(StringUtils.isNotBlank(bo.getEmail()), FileApprove::getEmail, bo.getEmail());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), FileApprove::getStatus, bo.getStatus());
+        lqw.eq(Objects.nonNull(bo.getSysDeptFileId()), FileApprove::getSysDeptFileId, bo.getSysDeptFileId());
+        lqw.eq(Objects.nonNull(bo.getCreateBy()), FileApprove::getCreateBy, bo.getCreateBy());
         return lqw;
     }