diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepGroupServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepGroupServiceImpl.java index be253de..68b5ef1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepGroupServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepGroupServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StepGroupMapper; import com.hxhq.business.domain.StepGroup; @@ -29,6 +30,9 @@ public class StepGroupServiceImpl extends ServiceImpl queryList(StepGroup stepGroup) { QueryWrapper queryWrapper = Wrappers.query(); + if(StringUtils.isNoneBlank(stepGroup.getName())){ + queryWrapper.like("name",stepGroup.getName()); + } return this.list(queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepServiceImpl.java index a530ff0..e5a0f6b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StepServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StepMapper; import com.hxhq.business.domain.Step; @@ -29,6 +30,12 @@ public class StepServiceImpl extends ServiceImpl implements IS public List queryList(Step step) { QueryWrapper queryWrapper = Wrappers.query(); + if(StringUtils.isNoneBlank(step.getName())){ + queryWrapper.like("name",step.getName()); + } + if(StringUtils.isNoneBlank(step.getSn())){ + queryWrapper.like("sn",step.getSn()); + } return this.list(queryWrapper); }