Merge remote-tracking branch 'origin/master'

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java

@@ -43,8 +43,12 @@ public class ArchiveTreeController extends BladeController {
     @PostMapping("/init")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "初始化归档树根节点", notes = "传入token")
-    public R<ArchiveTree> init() {
-        boolean b = archiveTreeService.initArchiveTree();
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "projectId", value = "项目id，0是系统级")
+    })
+    public R<ArchiveTree> init(Long projectId) {
+
+        boolean b = archiveTreeService.initArchiveTree(projectId);
         if (b) {
             return R.success("初始化创建成功");
         }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeService.java

@@ -14,7 +14,7 @@ import java.util.Map;
 
 public interface IArchiveTreeService extends BaseService<ArchiveTree> {
 
-	boolean initArchiveTree();
+	boolean initArchiveTree(Long projectId);
 
 	boolean submit(ArchiveTreeDTO archiveTreeDTO);
 

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

@@ -43,7 +43,11 @@ public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, A
     private final ArchiveAutoRuleWbsMapper archiveAutoRuleWbsMapper;
 
     @Override
-    public boolean initArchiveTree() {
+    public boolean initArchiveTree(Long projectId) {
+        if (projectId != null && projectId != 0) {
+            return initArchiveProjectTree(projectId);
+        }
+
         QueryWrapper<ArchiveTree> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("parent_id", 0);
         queryWrapper.eq("project_id", 0);