From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
index 2dfa5eb..c822433 100644
--- a/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/configItemWarehouse/ConfigItemWarehouseDao.xml
@@ -17,5 +17,19 @@
             ORDER BY ${orderBySql}
         </if>
     </select>
+    <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
+        SET @row_number = 0;
+        SELECT  dd.dict_label AS name,
+        (@row_number := @row_number + 1) AS no
+        FROM sys_dict_type dt
+        JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
+        <where>
+            dd.IS_DELETE = 0
+            <if test="dictType != null and dictType != ''">
+                and dt.DICT_TYPE = #{dictType}
+            </if>
+        </where>
+        ORDER BY dd.sort
+    </select>
 
 </mapper>

--
Gitblit v1.9.1