|
@@ -393,11 +393,11 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
}
|
|
}
|
|
for (Long groupId : groupList) {
|
|
for (Long groupId : groupList) {
|
|
JSONObject groupIdObj = new JSONObject();
|
|
JSONObject groupIdObj = new JSONObject();
|
|
- List<Long> batchNos = ruleAccountThresholdMapper.selectbatchNosByGroupIdId(accountId, groupId);
|
|
|
|
|
|
+ List<String> batchNos = ruleAccountThresholdMapper.selectbatchNosByGroupIdId(accountId, groupId);
|
|
if (Check.isNull(batchNos)) {
|
|
if (Check.isNull(batchNos)) {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
- for (Long batchNo : batchNos) {
|
|
|
|
|
|
+ for (String batchNo : batchNos) {
|
|
JSONObject batchNoObj = new JSONObject();
|
|
JSONObject batchNoObj = new JSONObject();
|
|
List<RuleAccountThreshold> thresholdList = ruleAccountThresholdMapper.selectCopyThresholdByAccountId(accountId, groupId, batchNo);
|
|
List<RuleAccountThreshold> thresholdList = ruleAccountThresholdMapper.selectCopyThresholdByAccountId(accountId, groupId, batchNo);
|
|
if (Check.isNull(thresholdList)) {
|
|
if (Check.isNull(thresholdList)) {
|