From 31b3387f731ff1950e4ab49145c0911139c3db5b Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Wed, 20 Nov 2024 09:50:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=9A=E5=AF=86=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/web/controller/manager/SecretManager.java | 1 +
 .../java/com/ruoyi/system/domain/secreting/TdSecreting.java  | 2 ++
 .../service/secreting/impl/TdSecretingServiceImpl.java       | 2 ++
 .../src/main/resources/mapper/system/TdSecretingMapper.xml   | 5 ++++-
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SecretManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SecretManager.java
index 1b45430..e6d2d7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SecretManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/SecretManager.java
@@ -40,6 +40,7 @@ public class SecretManager {
             tdSecreting.setCreateBy(ShiroUtils.getSysUser().getLoginName());
             tdSecreting.setCreateTime(new Date());
         }
+        tdSecreting.setDeptId(ShiroUtils.getSysUser().getDeptId());
         return secretingService.saveOrUpdate(tdSecreting);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/secreting/TdSecreting.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/secreting/TdSecreting.java
index 6ad820a..7724625 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/secreting/TdSecreting.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/secreting/TdSecreting.java
@@ -63,6 +63,8 @@ public class TdSecreting extends BaseEntity {
      */
     private String keyPoint;
 
+    private Long deptId;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/secreting/impl/TdSecretingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/secreting/impl/TdSecretingServiceImpl.java
index 8a670ef..e3ff45d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/secreting/impl/TdSecretingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/secreting/impl/TdSecretingServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.secreting.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.system.domain.secreting.TdSecreting;
 import com.ruoyi.system.mapper.secreting.TdSecretingMapper;
 import com.ruoyi.system.service.secreting.TdSecretingService;
@@ -22,6 +23,7 @@ public class TdSecretingServiceImpl extends ServiceImpl<TdSecretingMapper, TdSec
     private TdSecretingMapper tdSecretingMapper;
 
     @Override
+    @DataScope(deptAlias = "d")
     public List<TdSecreting> selectSecretList(TdSecreting tdSecreting) {
         return tdSecretingMapper.selectSecretList(tdSecreting);
     }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdSecretingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdSecretingMapper.xml
index 7706dc3..6864bf3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdSecretingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdSecretingMapper.xml
@@ -19,6 +19,7 @@
             <result property="secretDegree" column="secret_degree" jdbcType="VARCHAR"/>
             <result property="term" column="term" jdbcType="VARCHAR"/>
             <result property="keyPoint" column="key_point" jdbcType="VARCHAR"/>
+            <result property="deptId" column="dept_id" jdbcType="BIGINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -30,7 +31,7 @@
     </sql>
 
     <select id="selectSecretList" resultType="com.ruoyi.system.domain.secreting.TdSecreting">
-        select  <include refid="Base_Column_List"/> from  td_secreting
+        select  <include refid="Base_Column_List"/> from  td_secreting d
         <trim prefix="where" prefixOverrides="and|or">
             <if test="secretDegree!=null and secretDegree!=''">
                 AND secret_degree = #{secretDegree}
@@ -38,6 +39,8 @@
             <if test="responsible!=null and responsible!=''">
                 AND responsible = #{responsible}
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </trim>
     </select>
 </mapper>