|
@@ -1645,6 +1645,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
ruleGroup.setIsRequired(groupJson.getInteger("isRequired"));
|
|
|
ruleGroup.setOperate(groupJson.getString("operate"));
|
|
|
ruleGroup.setSendType(groupJson.getString("sendType"));
|
|
|
+ ruleGroup.setOperation(groupJson.getInteger("operation"));
|
|
|
boolean save = ruleGroupService.save(ruleGroup); // 新增规则组
|
|
|
if (save) {
|
|
|
for (int j = 0; j < ruleIds.size(); j++) {
|
|
@@ -1660,7 +1661,6 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
updateThreshold.setId(threshold);
|
|
|
updateThreshold.setGroupId(ruleGroup.getId());
|
|
|
ruleAccountThresholdMapper.updateById(updateThreshold); // 同步到阈值之后 阈值关联到组id
|
|
|
-
|
|
|
}
|
|
|
JSONArray groupIds = JSONArray.parseArray(template.getGroupIds());
|
|
|
groupIds.add(ruleGroup.getId());
|