Commit 3f2e545d by guojuxing

新增商户规则,规则树ID,过滤重复ID

parent 1ca1fec0
......@@ -176,6 +176,8 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
enterpriseIdList.add(enterpriseDTO.getEnterpriseId());
}
}
//用于过滤重复ID
Set<String> enterpriseTempSet = new HashSet<>();
if (enterpriseType.intValue() == 1) {
String[] arr = dto.getEnterpriseIds().split(",");
enterpriseIdList.clear();
......@@ -190,7 +192,11 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
if (!enterpriseSet.contains(id.toString())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "部分商户数据错误,不存在的商户");
}
enterpriseIdList.add(id);
enterpriseTempSet.add(str);
}
//循环装载
for (String str : enterpriseTempSet) {
enterpriseIdList.add(Integer.parseInt(str));
}
}
return ServiceResponse.success(enterpriseIdList);
......@@ -205,6 +211,8 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
ruleIdSet.add(rule.getRuleId().toString());
}
}
//用于过滤重复ID
Set<String> ruleIdTempSet = new HashSet<>();
String[] arr = dto.getRuleIds().split(",");
for (String str : arr) {
if (StringUtils.isBlank(str)) {
......@@ -217,7 +225,11 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
if (!ruleIdSet.contains(id.toString())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "规则树数据错误,不存在的规则");
}
ruleIdList.add(id);
ruleIdTempSet.add(str);
}
//循环装载
for (String str : ruleIdTempSet) {
ruleIdList.add(Integer.parseInt(str));
}
return ServiceResponse.success(ruleIdList);
}
......
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