From 18f7808b6786bcf118f8e65c5e42c32a50dddde9 Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Tue, 3 Mar 2026 18:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E5=8F=AA=E6=A1=A3=E6=A1=88=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

---
 .../zhyc/module/base/controller/BasSheepController.java    | 5 +++++
 .../main/java/com/zhyc/module/base/domain/BasSheep.java    | 7 +++++++
 .../main/java/com/zhyc/module/base/domain/SheepFile.java   | 6 ++++++
 .../module/base/service/impl/SheepFileServiceImpl.java     | 4 ++++
 .../src/main/resources/mapper/base/BasSheepMapper.xml      | 4 ++++
 .../src/main/resources/mapper/base/SheepFileMapper.xml     | 2 ++
 6 files changed, 28 insertions(+)

diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
index 20fbe9a..d7ead21 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/controller/BasSheepController.java
@@ -84,6 +84,11 @@ public class BasSheepController extends BaseController {
     @Log(title = "羊只基本信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BasSheep basSheep) {
+
+        // 新增下面这两行：从当前登录态中获取部门ID和用户ID，并赋值给即将保存的实体
+        basSheep.setDeptId(getDeptId());
+        basSheep.setUserId(getUserId());
+
         return toAjax(basSheepService.insertBasSheep(basSheep));
     }
 
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java
index cc608df..4b30852 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/BasSheep.java
@@ -189,4 +189,11 @@ public class BasSheep extends BaseEntity
     private Long isDelete;
 
 
+    /** 用户编号 */
+    private Long userId;
+
+    /** 部门编号 */
+    private Long deptId;
+
+
 }
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java
index 9966094..c10717c 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/domain/SheepFile.java
@@ -319,4 +319,10 @@ public class SheepFile extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createTime;
+
+    /** 用户编号 */
+    private Long userId;
+
+    /** 部门编号 */
+    private Long deptId;
 }
\ No newline at end of file
diff --git a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
index 31299df..13a0f2b 100644
--- a/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
+++ b/zhyc-module/src/main/java/com/zhyc/module/base/service/impl/SheepFileServiceImpl.java
@@ -1,5 +1,7 @@
 package com.zhyc.module.base.service.impl;
 
+// 新增这一行导入
+import com.zhyc.common.annotation.DataScope;
 import com.zhyc.module.base.domain.BreedRamFile;
 import com.zhyc.module.base.domain.SheepFile;
 import com.zhyc.module.base.mapper.SheepFileMapper;
@@ -38,6 +40,7 @@ public class SheepFileServiceImpl implements ISheepFileService {
     /**
      * 查询羊只档案列表
      */
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<SheepFile> selectSheepFileList(SheepFile sheepFile) {
         return sheepFileMapper.selectSheepFileList(sheepFile);
@@ -100,6 +103,7 @@ public class SheepFileServiceImpl implements ISheepFileService {
      * 必须调用 Mapper 中对应的 XML 方法 (selectSheepFileListByCondition)
      * 并且传递 sheepFile 对象以启用 <foreach> 列表查询
      */
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<SheepFile> selectSheepFileListByCondition(Map<String, Object> params, SheepFile sheepFile) {
         // 1. 验证并处理自定义参数 (驼峰转下划线、安全检查)
diff --git a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml
index a2660f4..85a7670 100644
--- a/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/base/BasSheepMapper.xml
@@ -251,6 +251,8 @@
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="isDelete != null">is_delete,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="deptId != null">dept_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="manageTags != null">#{manageTags},</if>
@@ -292,6 +294,8 @@
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="isDelete != null">#{isDelete},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="deptId != null">#{deptId},</if>
         </trim>
     </insert>
 
diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
index c897edb..cc518da 100644
--- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
@@ -90,6 +90,7 @@
             <if test="gender != null "> and gender = #{gender}</if>
             <if test="statusId != null "> and status_id = #{statusId}</if>
             <if test="breed != null  and breed != ''"> and breed = #{breed}</if>
+            ${params.dataScope}
         </where>
         ORDER BY id ASC
     </select>
@@ -268,6 +269,7 @@
                     </if>
                 </foreach>
             </if>
+            ${params.dataScope}
         </where>
         ORDER BY id ASC
     </select>