|
@@ -73,7 +73,9 @@ public class RuleAggregate {
|
|
descartes(ruleBaseList, ruleBaseGroup, 0, new ArrayList<>());
|
|
descartes(ruleBaseList, ruleBaseGroup, 0, new ArrayList<>());
|
|
for (List<RuleBaseDTO> ruleBaseDTOList : ruleBaseGroup) {
|
|
for (List<RuleBaseDTO> ruleBaseDTOList : ruleBaseGroup) {
|
|
RuleConditionDTO ruleConditionDTO1 = new RuleConditionDTO();
|
|
RuleConditionDTO ruleConditionDTO1 = new RuleConditionDTO();
|
|
- BeanUtil.copyProperties(ruleConditionDTO, ruleConditionDTO1);
|
|
|
|
|
|
+ ruleConditionDTO1.setHasSubCond(ruleConditionDTO.getHasSubCond());
|
|
|
|
+ ruleConditionDTO1.setRuleGroup(ruleConditionDTO.getRuleGroup());
|
|
|
|
+ ruleConditionDTO1.setMsg(ruleConditionDTO.getMsg());
|
|
ruleConditionDTO1.getRuleBaseDTOList().addAll(ruleBaseDTOList);
|
|
ruleConditionDTO1.getRuleBaseDTOList().addAll(ruleBaseDTOList);
|
|
ruleDTO.getRuleConditionDTOList().add(ruleConditionDTO1);
|
|
ruleDTO.getRuleConditionDTOList().add(ruleConditionDTO1);
|
|
}
|
|
}
|