diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java index be2ee58..2602aa6 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java @@ -2,6 +2,7 @@ package com.cnbm.packing.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.cnbm.admin.utils.CodeGeneratorHelper; import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; @@ -37,6 +38,14 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); wrapper.like(StringUtils.isNotBlank(name), PrintModel.NAME, name); + if(params.get("type")!=null) { + Integer type = Integer.parseInt(params.get("type").toString()); + wrapper.eq(ObjectUtils.isNotNull(type), PrintModel.LINE_BODY, type); + } + if(params.get("lineBody")!=null) { + Integer lineBody = Integer.parseInt(params.get("lineBody").toString()); + wrapper.eq(ObjectUtils.isNotNull(lineBody), PrintModel.LINE_BODY, lineBody); + } return wrapper; } diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index 2fc8d9b..e29d19b 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -51,11 +51,11 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl