From 6c9c60fa3c2c6f025084ce912dd9fd6d78942076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 25 Mar 2023 21:52:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=85=B3=E9=94=AE=E8=AF=8D?=
 =?UTF-8?q?=E6=9F=A5=E6=89=BE=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=88=E8=A7=A3=E5=86=B3=E4=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=87=BA=E8=A2=AB=E7=A6=81=E7=94=A8=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?bug=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
index 41823f6d..80a0e6ce 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
@@ -302,7 +302,7 @@
         select me.bar_code, m.name, m.standard, m.model, m.color, me.commodity_unit unit
         from jsh_material m
         left join jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
-        where 1=1
+        where m.enabled=1 and me.id is not null
         <if test="materialParam != null and materialParam !=''">
             <bind name="bindKey" value="'%'+materialParam+'%'"/>
             and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})