From e2cef6c358e57c2bc63e67a05c88c52585bb96db Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 十二月 2023 11:22:29 +0800
Subject: [PATCH] 项目表

---
 modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
index 99d2c51..f7ab446 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -4,10 +4,11 @@
 <mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">
 
     <select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
-        select a.*
+        select a.*, p.software_name,p.software_identity
         from item_circulat_order 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>
@@ -17,4 +18,5 @@
         </if>
     </select>
 
+
 </mapper>

--
Gitblit v1.9.1