From b3a8282dedb72fbfc4ebafd6d7ec4a621781cb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Apr 2020 12:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug:=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8E=E9=87=8D=E6=96=B0=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=90=8C=E4=B8=AA=E5=95=86=E5=93=81=E6=8F=90=E7=A4=BA=E2=80=9C?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/erp/service/material/MaterialService.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jsh/erp/service/material/MaterialService.java b/src/main/java/com/jsh/erp/service/material/MaterialService.java
index 86e51d9c..1d6849e5 100644
--- a/src/main/java/com/jsh/erp/service/material/MaterialService.java
+++ b/src/main/java/com/jsh/erp/service/material/MaterialService.java
@@ -267,7 +267,8 @@ public class MaterialService {
         MaterialExample.Criteria criteria = example.createCriteria();
         criteria.andNameEqualTo(name).andModelEqualTo(model).andColorEqualTo(color)
                 .andStandardEqualTo(standard).andMfrsEqualTo(mfrs)
-                .andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3);
+                .andOtherfield1EqualTo(otherField1).andOtherfield2EqualTo(otherField2).andOtherfield2EqualTo(otherField3)
+                .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         if (id > 0) {
             criteria.andIdNotEqualTo(id);
         }