diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java index 9eae2f1..db27ea9 100644 --- a/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java +++ b/muyu-rule-server/src/main/java/com/muyu/rule/controller/RuleController.java @@ -31,7 +31,7 @@ public class RuleController { */ @RequestMapping(path = "/list", method = RequestMethod.POST) @Operation(summary = "查看规则", description = "查看规则") - public Result> select(Rule rule) { + public Result> select(@RequestBody Rule rule) { return Result.success(ruleService.selects(rule)); } diff --git a/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java index d6317ba..c707514 100644 --- a/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java +++ b/muyu-rule-server/src/main/java/com/muyu/rule/service/impl/RuleServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.rule.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.rule.Desensitization; import com.muyu.rule.mapper.RuleMapper; import com.muyu.rule.service.RuleService; @@ -37,16 +38,25 @@ public class RuleServiceImpl extends ServiceImpl implements Ru /** * 基本查询 + * * @param rule * @return */ @Override public List selects(Rule rule) { LambdaQueryWrapper ruleLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ruleLambdaQueryWrapper.eq(Rule::getName, rule.getName()) - .like(Rule::getName, rule.getName()) - .eq(Rule::getIsActivate, rule.getIsActivate()) - ; + //名称模糊 + if (StringUtils.isNotBlank(rule.getName())) { + ruleLambdaQueryWrapper.like(Rule::getName, rule.getName()); + } + //名称精确 + if (StringUtils.isNotBlank(rule.getName())) { + ruleLambdaQueryWrapper.eq(Rule::getName, rule.getName()); + } + //激活状态 + if (StringUtils.isNotBlank(rule.getIsActivate())) { + ruleLambdaQueryWrapper.eq(Rule::getIsActivate, rule.getIsActivate()); + } List list = this.list(ruleLambdaQueryWrapper); return list; }