From 6ad46dfcc294db8b18cfee343ce9b32c053c02bc Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 09 四月 2026 14:13:17 +0800
Subject: [PATCH] fix(staff): 解决默认密码为空时的加密问题
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..a9d431f 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -52,6 +52,25 @@
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+ WITH RECURSIVE cte AS (
+ SELECT id, product_name, parent_id, id AS current_id
+ FROM product
+
+ UNION ALL
+
+ SELECT c.id, c.product_name, p.parent_id, p.id
+ FROM cte c
+ JOIN product p ON c.parent_id = p.id
+ ),
+ root_map AS (
+ SELECT
+ c.id,
+ p.id AS root_id,
+ p.product_name AS root_name
+ FROM cte c
+ JOIN product p ON c.current_id = p.id
+ WHERE p.parent_id IS NULL
+ )
select si.id,
si.qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
@@ -63,15 +82,22 @@
(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
pm.model,
si.remark,
+ si.warehouse_code,
+ si.warehouse_name,
+ si.product_code,
pm.unit,
p.product_name
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
+ LEFT JOIN root_map rm ON pm.product_id = rm.id
left join product p on pm.product_id = p.id
where 1 = 1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.rootName != null and ew.rootName != ''">
+ and rm.root_name = #{ew.rootName}
+ </if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
select si.qualitity,
--
Gitblit v1.9.3