From 77d3a205308c5a5f635da39642dd0d96e7fe13d5 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Tue, 1 Apr 2025 18:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=81=9A=E6=9D=83=E9=99=90=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/framework/util/DataScopeUtil.java | 8 +++++---
 .../main/java/com/ruoyi/bst/fault/mapper/FaultMapper.xml  | 7 +++++++
 .../main/java/com/ruoyi/web/app/AppFaultController.java   | 6 ------
 .../src/main/java/com/ruoyi/web/bst/FaultController.java  | 1 +
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
index 3624773..723991f 100644
--- a/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
+++ b/common-ruoyi/ruoyi-framework/src/main/java/com/ruoyi/framework/util/DataScopeUtil.java
@@ -65,9 +65,11 @@ public class DataScopeUtil {
 
     /**
      * Mybatis直接使用的方法
-     * @param deptAlias
-     * @param userAlias
-     * @param needScope
+     * @param deptAlias 部门别名
+     * @param userAlias 用户别名
+     * @param deptSetAlias 部门逗号分隔字段别名
+     * @param userSetAlias 用户逗号分隔字段别名
+     * @param needScope 是否需要数据隔离
      * @return
      */
     public static String dataScope(String deptAlias, String userAlias, String deptSetAlias, String userSetAlias, boolean needScope) {
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 d1d290b..99e29ed 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
@@ -37,6 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="query.faultDetail != null  and query.faultDetail != ''"> and bf.fault_detail = #{query.faultDetail}</if>
         <if test="query.appealStatus != null  and query.appealStatus != ''"> and bf.appeal_status = #{query.appealStatus}</if>
+        ${@com.ruoyi.framework.util.datascopeutil@dataScope(
+           null,
+           "ba.user_id,ba.create_id",
+           null,
+           null,
+           query.scope
+       )}
         ${query.params.dataScope}
     </sql>
 
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
index 3cb261a..d78916d 100644
--- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppFaultController.java
@@ -35,12 +35,6 @@ public class AppFaultController extends BaseController {
     @Autowired
     private FaultService  faultService;
 
-    @Autowired
-    private DeviceService deviceService;
-
-    @Autowired
-    private OrderService orderService;
-
     @Autowired
     private FaultConverter faultConverter;
 
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 239dcfb..1a38dd9 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
@@ -42,6 +42,7 @@ public class FaultController extends BaseController
     {
         startPage();
         startOrderBy();
+        query.setScope(true);
         List<FaultVO> list = faultService.selectFaultList(query);
         return getDataTable(list);
     }