diff --git a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java index 408341c..1cd0445 100644 --- a/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java +++ b/cloud-rule-server/src/main/java/com/muyu/servier/impl/RuleDataServiceImpl.java @@ -39,8 +39,12 @@ public class RuleDataServiceImpl RuleData::getRuleName, ruleDataListReq.getRuleName() ); queryWrapper.eq( - StringUtils.isNotEmpty(ruleDataListReq.getCreateBy()), - RuleData::getCreateBy, ruleDataListReq.getCreateBy() + StringUtils.isNotEmpty(ruleDataListReq.getRuleType()), + RuleData::getRuleType, ruleDataListReq.getRuleType() + ); + queryWrapper.eq( + StringUtils.isNotEmpty(ruleDataListReq.getRuleActivate()), + RuleData::getRuleActivate, ruleDataListReq.getRuleActivate() ); queryWrapper.eq( StringUtils.isNotEmpty(ruleDataListReq.getRuleStatus()),