Merge remote-tracking branch 'origin/master' into master

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TaskApprovalVO.java

@@ -70,6 +70,8 @@ public class TaskApprovalVO {
             this.fileUrl = fileUrl;
         }
 
+        public ApprovalFile() {
+        }
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -41,10 +41,7 @@ import org.springblade.flow.core.feign.NewFlowClient;
 import org.springblade.flow.core.utils.FlowUtil;
 import org.springblade.flow.core.utils.TaskUtil;
 import org.springblade.flow.core.vo.FlowProcessVO;
-import org.springblade.manager.entity.ContractInfo;
-import org.springblade.manager.entity.ProjectInfo;
-import org.springblade.manager.entity.TabBusstimeInfo;
-import org.springblade.manager.entity.WbsTreeContract;
+import org.springblade.manager.entity.*;
 import org.springblade.manager.feign.*;
 import org.springblade.manager.vo.AppWbsTreeContractVO;
 import org.springblade.resource.feign.CommonFileClient;
@@ -279,6 +276,14 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                         }
                         vo.setApprovalFileList(query.getName() + "（关联试验工程部位信息文件）", StringUtils.isNotEmpty(query.getPdfTrialUrlPosition()) ? query.getPdfTrialUrlPosition() : null);
                     }
+
+                    /** 任务审批查看时，把节点附件列表跟在上报文件后面*/
+                    List<TaskApprovalVO.ApprovalFile> files = jdbcTemplate.query("select name as fileName,domain_url as fileUrl from m_table_file where is_deleted = 0 and tab_id = ?",new BeanPropertyRowMapper<>(TaskApprovalVO.ApprovalFile.class),query.getWbsId());
+                    if (ObjectUtil.isNotEmpty(files)){
+                        List<TaskApprovalVO.ApprovalFile> fileList = vo.getApprovalFileList();
+                        fileList.addAll(files);
+
+                    }
                 }
             } else if (new Integer("2").equals(query.getType())) {
                 //试验

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -97,6 +97,10 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
         if (sysTrees == null || sysTrees.size() == 0) {
             return false;
         }
+        /** 只需要存在一份系统级归档树，保存时把租户id覆盖为当前用户租户*/
+        for (ArchiveTree sysTree : sysTrees) {
+            sysTree.setTenantId(AuthUtil.getTenantId());
+        }
 
         List<ArchiveTree> archiveTrees = new ArrayList<>();
         Map<Long, Long> oldNewMap = new LinkedHashMap<>();
@@ -369,7 +373,7 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
     @Override
     public List<ArchiveTree> treeList(String tenantId, Long projectId, Integer disPlayTree, Integer nodeType) {
         return baseMapper.selectList(Wrappers.<ArchiveTree>query().lambda()
-                .eq(ArchiveTree::getTenantId, tenantId).eq(ArchiveTree::getIsDeleted, 0)
+                .eq(ArchiveTree::getIsDeleted, 0)
                 .eq(ArchiveTree::getProjectId, projectId).orderByAsc(ArchiveTree::getSort));
     }