From 0136a8707c6f529cf65287e86fd76ec9380f5e5c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 1 Sep 2026 17:02:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=BA=E5=99=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=9A=90=E8=97=8F=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CanteenDailyMenuMapper.xml  | 2 +-
 .../src/main/resources/mapper/WalletTransactionMapper.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
index db71e310b..a9bc87e5b 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
@@ -95,7 +95,7 @@
         LEFT JOIN canteen_category c
         on sp.category_id = c.id AND c.del_flag = 0
         <where>
-            sp.del_flag = 0 and t.del_flag = 0 and sp.is_show = 0
+            sp.del_flag = 0 and t.del_flag = 0
             <if test="categoryId != null">
                 AND sp.category_id = #{categoryId}
             </if>
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml
index e89fd9259..0e8b96cd3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml
@@ -171,7 +171,7 @@
         from wallet_transaction a
         left join wallet_manage m on m.id = a.wallet_id
         <where>
-            a.del_flag = 0 and m.dept_id is not null
+            a.del_flag = 0 and a.dept_id is not null
             <if test="dto.walletId != null">
                 a.wallet_id = ${dto.walletId}
             </if>
@@ -194,13 +194,13 @@
             <if test="dto.deptIds != null and dto.deptIds.size() != 0">
                 <choose>
                     <when test="dto.isInclude != null and dto.isInclude == true">
-                        and m.dept_id IN
+                        and a.dept_id IN
                     </when>
                     <when test="dto.isInclude != null and dto.isInclude == false">
-                        and m.dept_id NOT IN
+                        and a.dept_id NOT IN
                     </when>
                     <otherwise>
-                        and m.dept_id IN
+                        and a.dept_id IN
                     </otherwise>
                 </choose>
                 <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">