From 7a0c5479c363a10f573aa15a54dc8130eabd47ff Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 29 一月 2024 11:47:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 7dfea64..a545f79 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -12,9 +12,7 @@
and warehouse_id = ${warehouseId}
</if>
</where>
- <if test="orderBySql!=null">
- ORDER BY ${orderBySql}
- </if>
+ ORDER BY `no`
</select>
<select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
SET @row_number = 0;
@@ -34,12 +32,13 @@
</if>
UNION
SELECT (@row_number := @row_number + 1) AS no,
- NULL AS secretClass,
+ p.secret_class,
'杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
NULL AS version,
s.code AS itemIdentify,
s.id as src_id
FROM software_test_order s
+ JOIN project p ON p.id = ${projectId}
WHERE s.is_delete = 0
AND s.project_id = ${projectId}
<if test="ids!=null and ids!=''">
@@ -47,12 +46,13 @@
</if>
UNION
SELECT (@row_number := @row_number + 1) AS no,
- NULL AS secretClass,
+ p.secret_class,
'鐗╁搧娴佽浆鍗�' AS itemName,
NULL AS version,
i.code AS itemIdentify,
i.id as src_id
FROM item_circulat_order i
+ JOIN project p ON p.id = ${projectId}
WHERE i.is_delete = 0
AND i.project_id = ${projectId}
<if test="ids!=null and ids!=''">
--
Gitblit v1.9.1