Browse Source

增加项目id

huangtf 2 years ago
parent
commit
31276f69ce

+ 12 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -158,10 +158,13 @@ public class ArchiveTreeContractController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "懒加载树形结构", notes = "传入父级id")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "parentId", value = "父级id", required = true)
+			@ApiImplicitParam(name = "parentId", value = "父级id", required = true),
+			@ApiImplicitParam(name = "projectId", value = "项目id", required = true)
 	})
-	public R<List<ArchiveTreeContractVO2>> lazyTree(Long parentId) {
-		Long projectId = 1578599210897772545L;
+	public R<List<ArchiveTreeContractVO2>> lazyTree(Long parentId,Long projectId) {
+		if (projectId == null) {
+			projectId = 1578599210897772545L;
+		}
 		List<ArchiveTreeContractVO2> tree = archiveTreeContractService.lazyTree2(AuthUtil.getTenantId(), parentId,projectId);
 		if (tree != null && tree.size() > 0) {
 			return R.data(tree);
@@ -178,10 +181,13 @@ public class ArchiveTreeContractController extends BladeController {
 	@ApiOperation(value = "全加载树形结构/显示树", notes = "disPlayTree、nodeType")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "disPlayTree", value = "是否加载显示树 'null'=不加载 '1'=加载"),
-			@ApiImplicitParam(name = "nodeType", value = "'null'=全加载 '1'=关联电子原生文件类型树 '2'=文件上传类型树")
+			@ApiImplicitParam(name = "nodeType", value = "'null'=全加载 '1'=关联电子原生文件类型树 '2'=文件上传类型树"),
+			@ApiImplicitParam(name = "projectId", value = "项目id", required = true)
 	})
-	public R<List<ArchiveTreeContractVO2>> tree(Integer disPlayTree, Integer nodeType){
-		Long projectId = 1578599210897772545L;
+	public R<List<ArchiveTreeContractVO2>> tree(Integer disPlayTree, Integer nodeType,Long projectId){
+		if (projectId == null) {
+			projectId = 1578599210897772545L;
+		}
 		List<ArchiveTreeContractVO2> tree = archiveTreeContractService.tree2(AuthUtil.getTenantId(), disPlayTree, nodeType,projectId);
 		if (tree != null && tree.size() > 0) {
 			return R.data(tree);