From 60b9c7806c189b80e120e2e59b4192860adc8052 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Sat, 12 Apr 2025 09:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=94=B3=E5=A0=B1bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml  | 8 ++++----
 .../src/main/java/com/ruoyi/web/bst/FaultController.java  | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
index f4d0655..7824a23 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml
@@ -22,12 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bf.vehicle_num,
             bf.store_id,
             su.agent_id
-        from <include refid="searchTables"/>
+        <include refid="searchTables"></include>
     </sql>
-
     <sql id="searchTables">
-        bst_fault bf
+        from  bst_fault bf
             left join sys_user su on bf.store_id = su.user_id
+            left join sys_user syu on bf.user_id = syu.user_id
     </sql>
 
     <sql id="searchCondition">
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.appealStatus != null  and query.appealStatus != ''"> and bf.appeal_status = #{query.appealStatus}</if>
         ${@com.ruoyi.framework.util.DataScopeUtil@dataScope(
            null,
-           "bf.store_id,su.agent_id",
+           "bf.store_id,su.agent_id,bf.user_id",
            null,
            null,
            query.scope
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java
index cc59c0d..091a0ad 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FaultController.java
@@ -49,6 +49,7 @@ public class FaultController extends BaseController
         startPage();
         startOrderBy();
         query.setScope(true);
+        query.setStoreId(getUserId());
         List<FaultVO> list = faultService.selectFaultList(query);
         return getDataTable(list);
     }