From 2df883fcbed176f83d8d144fd007e7f72fcb54d6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 01 二月 2024 17:21:24 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
index 0944e7b..6491e2d 100644
--- a/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/itemCirculatOrder/ItemCirculatOrderDao.xml
@@ -4,9 +4,15 @@
<mapper namespace="com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao">
<select id="getList" resultType="com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder">
- select a.*, p.*
+ select a.*, p.software_name,p.software_identity
from item_circulat_order a
- INNER JOIN project p ON p.id = a.project_id
+ JOIN project p ON p.id = a.project_id
+ <if test="secretClass!=null">
+ and p.secret_class <= #{secretClass}
+ </if>
+ <if test="deptId!=null">
+ and p.biz_dept_id = #{deptId}
+ </if>
<where>
a.is_delete = 0 and p.is_delete = 0
<if test="whereSql!=null">
@@ -17,16 +23,6 @@
ORDER BY ${orderBySql}
</if>
</select>
- <select id="itemList" resultType="com.zt.core.sys.dto.DictIstance">
- SELECT m.*
- FROM software_test_order_measured m
- JOIN software_test_order s ON s.id = m.order_id
- <where>
- s.is_delete = 0 and m.is_delete = 0
- <if test="projectId!=null">
- and s.project_id = ${projectId}
- </if>
- </where>
- </select>
+
</mapper>
--
Gitblit v1.9.1