From 810d10eb373bb181ca0e155d8bed8433fd69ebc0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 12 十二月 2023 15:50:17 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
index 7cfbb64..0af6c8b 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -17,7 +17,9 @@
</if>
</select>
<select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
- SELECT p.secret_class,
+ SET @row_number = 0;
+ SELECT (@row_number := @row_number + 1) AS no,
+ p.secret_class,
SUBSTRING(m.name, LOCATE('杞欢', m.name), LENGTH(m.name)) AS itemName,
m.identify AS version,
m.name AS Item_identify
@@ -27,7 +29,8 @@
WHERE s.is_delete = 0
AND s.id = m.order_id
UNION
- SELECT NULL AS secretClass,
+ SELECT (@row_number := @row_number + 1) AS no,
+ NULL AS secretClass,
'杞欢娴嬭瘯濮旀墭鍗�' AS itemName,
NULL AS version,
s.code AS itemIdentify
@@ -35,7 +38,8 @@
WHERE s.is_delete = 0
AND s.project_id = ${projectId}
UNION
- SELECT NULL AS secretClass,
+ SELECT (@row_number := @row_number + 1) AS no,
+ NULL AS secretClass,
'鐗╁搧娴佽浆鍗�' AS itemName,
NULL AS version,
i.code AS itemIdentify
@@ -48,7 +52,8 @@
from config_item_warehouse_detail a
WHERE a.is_delete = 0
and a.project_id = ${projectId}
- <if test="ids!=null">
+ and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail)
+ <if test="ids!=null and ids!=''">
AND id not in (${ids})
</if>
</select>
--
Gitblit v1.9.1