Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
operation-control-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王锦盛
operation-control-platform
Commits
037e92cc
Commit
037e92cc
authored
Mar 31, 2022
by
郭凡凡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
总部-应用列表树bug修复
parent
fcfa07f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
...ms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+8
-2
No files found.
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
View file @
037e92cc
...
...
@@ -262,8 +262,14 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
@Override
public
List
<
GroupDto
>
tenantBaseTreeOther
(
String
tenantGroupCode
,
String
tenantGroupCompanyCode
,
String
tenantCode
)
{
List
<
GroupDto
>
ocpTenantGroups
=
ocpTenantGroupMapper
.
tenantBaseTreeOther
(
tenantGroupCode
,
tenantGroupCompanyCode
);
if
(
ocpTenantGroups
.
size
()
!=
0
)
{
return
ocpTenantGroups
;
List
<
GroupDto
>
list
=
new
ArrayList
<>();
for
(
GroupDto
ocpTenantGroup
:
ocpTenantGroups
)
{
if
(
StringUtils
.
isNotBlank
(
ocpTenantGroup
.
getTenantCode
())&&
StringUtils
.
isNotBlank
(
ocpTenantGroup
.
getTenantName
())){
list
.
add
(
ocpTenantGroup
);
}
}
if
(
list
.
size
()
!=
0
)
{
return
list
;
}
else
{
if
(
StringUtils
.
isNotEmpty
(
tenantCode
))
{
return
Collections
.
EMPTY_LIST
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment