|
|
@@ -80,6 +80,7 @@ public class QualityControlRuleServiceImpl implements IQualityControlRuleService
|
|
|
.eq(StringUtils.isNotBlank(bo.getQcBehavior()), QualityControlRule::getQcBehavior, bo.getQcBehavior())
|
|
|
.eq(StringUtils.isNotBlank(bo.getQcStage()), QualityControlRule::getQcStage, bo.getQcStage())
|
|
|
.eq(StringUtils.isNotBlank(bo.getRuleCode()), QualityControlRule::getRuleCode, bo.getRuleCode())
|
|
|
+ .eq(bo.getIsEnabled() != null, QualityControlRule::getIsEnabled, bo.getIsEnabled())
|
|
|
.eq(QualityControlRule::getDelFlag, bo.getDelFlag())
|
|
|
.like(StringUtils.isNotBlank(bo.getRuleContent()), QualityControlRule::getRuleContent, bo.getRuleContent());
|
|
|
String categoryOrderSql = buildCategoryOrderSql(categoryOrder);
|
|
|
@@ -112,6 +113,7 @@ public class QualityControlRuleServiceImpl implements IQualityControlRuleService
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getRuleCode()), QualityControlRule::getRuleCode, bo.getRuleCode());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getRuleContent()), QualityControlRule::getRuleContent, bo.getRuleContent());
|
|
|
lqw.eq(StringUtils.isNotBlank(bo.getQcStage()), QualityControlRule::getQcStage, bo.getQcStage());
|
|
|
+ lqw.eq(bo.getIsEnabled() != null, QualityControlRule::getIsEnabled, bo.getIsEnabled());
|
|
|
lqw.eq(QualityControlRule::getDelFlag, bo.getDelFlag());
|
|
|
String categoryOrderSql = buildCategoryOrderSql(categoryOrder);
|
|
|
if (StringUtils.isNotBlank(categoryOrderSql)) {
|