diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTaskDefectBo.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTaskDefectBo.java index 098c74b..f2825ab 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTaskDefectBo.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/domain/bo/QcInspectionTaskDefectBo.java @@ -51,16 +51,16 @@ public class QcInspectionTaskDefectBo extends BaseEntity { private String attr2; /** - * + * */ @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) private String attr3; /** - * + * */ @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class }) private String attr4; - + private String tenantId; } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTaskDefectServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTaskDefectServiceImpl.java index ab57b9b..281ac07 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTaskDefectServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionTaskDefectServiceImpl.java @@ -81,10 +81,7 @@ public class QcInspectionTaskDefectServiceImpl implements IQcInspectionTaskDefec .eq(StringUtils.isNotBlank(bo.getAttr3()), QcInspectionTaskDefect::getAttr3, bo.getAttr3()) .eq(StringUtils.isNotBlank(bo.getAttr4()), QcInspectionTaskDefect::getAttr4, bo.getAttr4()) .eq(StringUtils.isNotBlank(bo.getTenantId()), QcInspectionTaskDefect::getTenantId, bo.getTenantId()) - .eq(StringUtils.isNotBlank(bo.getCreateDept()), QcInspectionTaskDefect::getCreateDept, bo.getCreateDept()) - .eq(StringUtils.isNotBlank(bo.getCreateBy()), QcInspectionTaskDefect::getCreateBy, bo.getCreateBy()) .eq(bo.getCreateTime() != null, QcInspectionTaskDefect::getCreateTime, bo.getCreateTime()) - .eq(StringUtils.isNotBlank(bo.getUpdateBy()), QcInspectionTaskDefect::getUpdateBy, bo.getUpdateBy()) .eq(bo.getUpdateTime() != null, QcInspectionTaskDefect::getUpdateTime, bo.getUpdateTime()) .orderByDesc(QcInspectionTaskDefect::getCreateTime); return lqw;