Commit d6b8b717 by guojuxing

商户规则修复

parent 53b1c423
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment