From 9bb54038e2269d90bdfb1bff5f99b786c83141e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 3 Aug 2021 01:34:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9D=A1=E7=A0=81=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=88=A4=E6=96=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/materialExtend/MaterialExtendService.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
index 4b5aa80c..b3e15b52 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/materialExtend/MaterialExtendService.java
@@ -263,11 +263,13 @@ public class MaterialExtendService {
         MaterialExtendExample.Criteria criteria = example.createCriteria();
         criteria.andBarCodeEqualTo(barCode);
         if (id > 0) {
-            criteria.andIdNotEqualTo(id);
+            criteria.andIdNotEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
+        } else {
+            criteria.andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);
         }
         List<MaterialExtend> list =null;
         try{
-            list=  materialExtendMapper.selectByExample(example);
+            list = materialExtendMapper.selectByExample(example);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }