Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0d59fe0

Browse files
author
Thomas
committed
Merge conflict resolved
1 parenta59dd49 commit0d59fe0

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
importorg.lowcoder.api.permission.view.PermissionItemView;
1717
importorg.lowcoder.api.usermanagement.OrgDevChecker;
1818
importorg.lowcoder.domain.application.model.Application;
19-
importorg.lowcoder.domain.application.model.ApplicationStatus;
2019
importorg.lowcoder.domain.application.model.ApplicationType;
2120
importorg.lowcoder.domain.application.repository.ApplicationRepository;
2221
importorg.lowcoder.domain.application.service.ApplicationServiceImpl;
23-
importorg.lowcoder.domain.bundle.model.*;
22+
importorg.lowcoder.domain.bundle.model.Bundle;
23+
importorg.lowcoder.domain.bundle.model.BundleApplication;
24+
importorg.lowcoder.domain.bundle.model.BundleRequestType;
25+
importorg.lowcoder.domain.bundle.model.BundleStatus;
2426
importorg.lowcoder.domain.bundle.repository.BundleRepository;
2527
importorg.lowcoder.domain.bundle.service.BundleElementRelationService;
2628
importorg.lowcoder.domain.bundle.service.BundleService;
@@ -43,9 +45,7 @@
4345
importreactor.core.scheduler.Schedulers;
4446

4547
importjava.util.*;
46-
importjava.util.function.Function;=
47-
importjava.util.function.ToLongFunction;
48-
importjava.util.stream.Collectors;
48+
importjava.util.function.Function;
4949

5050
importstaticorg.lowcoder.domain.bundle.model.BundleStatus.NORMAL;
5151
importstaticorg.lowcoder.domain.permission.model.ResourceAction.*;

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/bundle/BundleApiServiceImplTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
importorg.lowcoder.domain.permission.model.ResourceRole;
1717
importorg.lowcoder.sdk.exception.BizError;
1818
importorg.lowcoder.sdk.exception.BizException;
19-
importorg.lowcoder.api.home.SessionUserServiceImpl;
20-
importorg.lowcoder.domain.organization.model.MemberRole;
21-
importorg.lowcoder.domain.organization.model.OrgMember;
2219
importorg.springframework.beans.factory.annotation.Autowired;
2320
importorg.springframework.boot.test.context.SpringBootTest;
2421
importorg.springframework.test.context.junit4.SpringRunner;
@@ -245,7 +242,7 @@ private boolean equals(PermissionItemView p1, PermissionItemView p2) {
245242
publicvoidtestAutoInheritFoldersPermissionsOnBundleCreate() {
246243
Mono<BundlePermissionView>permissionViewMono =
247244
folderApiService.grantPermission("folder01",Set.of("user02"),Set.of("group01"),ResourceRole.EDITOR)
248-
.then(createBundle("test","folder01"))
245+
.then(createBundle("test2","folder01"))
249246
.flatMap(bundleView ->bundleApiService.getBundlePermissions(
250247
bundleView.getBundleId()));
251248

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp