From 32cfd84dd77b00044042e099d22a470453165a58 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 17 九月 2026 23:28:25 +0800
Subject: [PATCH] fix: 修改登录信息查询排序，按登录时间降序��列

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 3dd2089..f494732 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -84,6 +84,10 @@
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
         </if>
+        <if test="ew.warnOnly != null and ew.warnOnly">
+            and COALESCE(si.warn_num, 0) &gt; 0
+            and (si.qualitity - COALESCE(si.locked_quantity, 0)) &lt;= si.warn_num
+        </if>
     </select>
 
     <select id="pageListCombinedStockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -222,7 +226,6 @@
         unit,
         product_name,
         product_id
-        order by combined.id desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">

--
Gitblit v1.9.3