From b129fda4a692e93a40a04d7f43bf03b5abbe9d4b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 27 十一月 2023 10:26:39 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
index 97a7255..2dfa5eb 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
@@ -4,10 +4,11 @@
 <mapper namespace="com.zt.life.modules.configItemWarehouse.dao.ConfigItemWarehouseDao">
 
     <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse">
-        select a.*
+        select a.* ,p.*
         from config_item_warehouse a
+        INNER JOIN  project p ON p.id = a.project_id
         <where>
-            a.is_delete = 0
+            a.is_delete = 0 and p.is_delete = 0
             <if test="whereSql!=null">
                 and ${whereSql}
             </if>

--
Gitblit v1.9.1