From 1cd7b21b415a113057e6e9e4c71c441ca8180606 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 25 Nov 2024 16:12:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=91=E5=AE=9A=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/WarehouseKeeperMapper.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index d2f7ab9a..7975dce6 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -34,9 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type_keeper mtk ON mtk.type_id = mt.type_id
             LEFT JOIN sys_user su ON su.user_id = mtk.user_id
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
-        <if test="userId != null and userId != ''">
-            AND su.user_id = #{userId}
-        </if>
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>
@@ -44,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND mt.type_name like concat('%', #{modelName}, '%')
         </if>
         GROUP BY mt.type_id
-        ORDER BY mt.type_id DESC
+        ORDER BY su.user_id DESC, mt.type_id DESC
     </select>
 
     <select id="getMaUserList" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">