Browse Source

filter_log查询条件模糊搜索

thing_master
siyang 1 year ago
parent
commit
433f308b5c
  1. 2
      modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java
  2. 2
      modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java

2
modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java

@ -47,7 +47,7 @@ public class FilterLogServiceImpl extends BaseServiceImpl<FilterLogMapper, Filte
.innerJoin(FILTER_LOG_ENTITY)
.on(FILTER_RULE_ENTITY.ID.eq(FILTER_LOG_ENTITY.FILTER_RULE_ID))
.eq(FilterRuleEntity::getTenantCode, UserContext.getTenantCode())
.eq(FilterRuleEntity::getName, filterRuleName, StringUtils.isNotBlank(filterRuleName))
.like(FilterRuleEntity::getName, filterRuleName, StringUtils.isNotBlank(filterRuleName))
.eq(FilterLogEntity::getStatus, status, Objects.nonNull(status))
.eq(FilterLogEntity::getResult, result, Objects.nonNull(result))
.orderBy(FilterLogEntity::getCreateDate)

2
modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterRuleServiceImpl.java

@ -55,7 +55,7 @@ public class FilterRuleServiceImpl extends BaseServiceImpl<FilterRuleMapper, Fil
.from(FILTER_RULE_ENTITY)
.innerJoin(FILTER_RULE_DETAIL_ENTITY)
.on(FILTER_RULE_ENTITY.ID.eq(FILTER_RULE_DETAIL_ENTITY.FILTER_RULE_ID))
.eq(FilterRuleEntity::getName, name, StringUtils.isNotBlank(name));
.like(FilterRuleEntity::getName, name, StringUtils.isNotBlank(name));
if (StringUtils.isNotBlank(thingKeyword)) {
wrapper.and(
FILTER_RULE_DETAIL_ENTITY

Loading…
Cancel
Save