From 48d82ce7c0818259b70aed1c351230253c59087b Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Wed, 4 Mar 2026 11:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E8=88=8D=E7=AE=A1=E7=90=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DaSheepfoldController.java     |  4 ++++
 .../zhyc/module/base/domain/DaSheepfold.java  | 22 +++++++++++++++++++
 .../service/impl/DaSheepfoldServiceImpl.java  |  3 +++
 .../mapper/base/DaSheepfoldMapper.xml         |  6 +++++
 4 files changed, 35 insertions(+)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java
index de91c69..01463d0 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/DaSheepfoldController.java
@@ -166,6 +166,10 @@ public class DaSheepfoldController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DaSheepfold daSheepfold)
     {
+        // 👇 新增这两行赋值语句
+        daSheepfold.setDeptId(getDeptId());
+        daSheepfold.setUserId(getUserId());
+
         return toAjax(daSheepfoldService.insertDaSheepfold(daSheepfold));
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java
index 8d48269..a5a0a27 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/DaSheepfold.java
@@ -121,4 +121,26 @@ public class DaSheepfold extends BaseEntity
     private Integer totalSheepCount;
 
 
+    // 👇 新增数据隔离字段
+    /** 用户编号 */
+    private Long userId;
+
+    /** 部门编号 */
+    private Long deptId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
 }
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java
index 389cacf..1ab33d5 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/DaSheepfoldServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zhyc.module.base.service.impl;
 
+import com.zhyc.common.annotation.DataScope;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zhyc.module.base.domain.BasSheep;
 import com.zhyc.module.base.domain.DaSheepfold;
@@ -50,6 +51,7 @@ public class DaSheepfoldServiceImpl implements IDaSheepfoldService
      * @param daSheepfold 羊舍管理
      * @return 羊舍管理
      */
+    @DataScope(deptAlias = "ds", userAlias = "ds")
     @Override
     public List<DaSheepfold> selectDaSheepfoldList(DaSheepfold daSheepfold)
     {
@@ -60,6 +62,7 @@ public class DaSheepfoldServiceImpl implements IDaSheepfoldService
     /**
      * 羊舍级别汇总查询（主表格）
      */
+    @DataScope(deptAlias = "ds", userAlias = "ds")
     public List<DaSheepfold> selectDaSheepfoldSummaryList(DaSheepfold daSheepfold) {
         return daSheepfoldMapper.selectDaSheepfoldSummaryList(daSheepfold);
     }
diff --git a/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml
index 902e4af..cdb7017 100644
--- a/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/base/DaSheepfoldMapper.xml
@@ -62,6 +62,7 @@
         <where>
             <if test="ranchId != null ">and ds.ranch_id = #{ranchId}</if>
             <if test="sheepfoldTypeId != null ">and ds.sheepfold_type_id = #{sheepfoldTypeId}</if>
+            ${params.dataScope}
         </where>
         -- 按羊舍维度分组（牧场+羊舍类型+羊舍编号 唯一标识一个羊舍）
         GROUP BY ds.ranch_id, ds.sheepfold_type_id, ds.sheepfold_no
@@ -92,6 +93,7 @@
             <if test="ranchId != null ">and ds.ranch_id = #{ranchId}</if>
             <if test="sheepfoldTypeId != null ">and ds.sheepfold_type_id = #{sheepfoldTypeId}</if>
             <if test="sheepfoldNo != null and sheepfoldNo != '' ">and ds.sheepfold_no = #{sheepfoldNo}</if>
+            ${params.dataScope}
         </where>
         GROUP BY ds.id,ds.ranch_id,ds.sheepfold_name,ds.sheepfold_type_id,ds.sheepfold_no,ds.row_no,ds.columns,ds.comment
         ORDER BY SUBSTRING_INDEX(ds.row_no, '-', 1), CAST(ds.columns AS UNSIGNED)
@@ -112,6 +114,8 @@
             <if test="rowNo != null">row_no,</if>
             <if test="columns != null">columns,</if>
             <if test="comment != null">comment,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ranchId != null">#{ranchId},</if>
@@ -121,6 +125,8 @@
             <if test="rowNo != null">#{rowNo},</if>
             <if test="columns != null">#{columns},</if>
             <if test="comment != null">#{comment},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>