Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-enterprise
Commits
d6b8b717
Commit
d6b8b717
authored
Mar 27, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商户规则修复
parent
53b1c423
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
ConfigRuleEnterpriseApiServiceImpl.java
...ervice/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java
+5
-4
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java
View file @
d6b8b717
...
...
@@ -159,11 +159,12 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
List
<
RuleEnterpriseDTO
>
resultList
=
resultPage
.
getResult
();
TabConfigRuleEnterprise
record
=
configRuleEnterpriseService
.
getByEnterpriseRuleId
(
defaultRule
.
getEnterpriseRuleId
());
if
(
CollectionUtils
.
isNotEmpty
(
resultList
))
{
resultList
.
add
(
0
,
new
RuleEnterpriseDTO
().
setEnterpriseRuleId
(
defaultRule
.
getEnterpriseRuleId
())
.
setRuleName
(
record
.
getRuleName
()).
setEnterpriseId
(-
1
));
resultPage
.
setResult
(
resultList
);
if
(
CollectionUtils
.
isEmpty
(
resultList
))
{
resultList
=
new
ArrayList
<>(
1
);
}
resultList
.
add
(
0
,
new
RuleEnterpriseDTO
().
setEnterpriseRuleId
(
defaultRule
.
getEnterpriseRuleId
())
.
setRuleName
(
record
.
getRuleName
()).
setEnterpriseId
(-
1
));
resultPage
.
setResult
(
resultList
);
}
}
return
ServiceResponse
.
success
(
resultPage
);
...
...
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