From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml |   12 ++++++++++--
 1 files changed, 10 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..6491e2d 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -4,10 +4,17 @@
 <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
+        JOIN project p ON p.id = a.project_id
+        <if test="secretClass!=null">
+            and p.secret_class &lt;= #{secretClass}
+        </if>
+        <if test="deptId!=null">
+            and p.biz_dept_id = #{deptId}
+        </if>
         <where>
-            a.is_delete = 0
+            a.is_delete = 0 and p.is_delete = 0
             <if test="whereSql!=null">
                 and ${whereSql}
             </if>
@@ -17,4 +24,5 @@
         </if>
     </select>
 
+
 </mapper>

--
Gitblit v1.9.1