From b8b15604b320a521665d746a09a44428c0a79d64 Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Wed, 4 Mar 2026 11:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E7=BE=A4=E7=BB=93=E6=9E=84=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

---
 .../service/impl/SheepFileServiceImpl.java    |  5 ++
 .../resources/mapper/base/SheepFileMapper.xml | 49 ++++++++++++-------
 2 files changed, 36 insertions(+), 18 deletions(-)

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 13a0f2b..960e54f 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
@@ -59,26 +59,31 @@ public class SheepFileServiceImpl implements ISheepFileService {
         return sheepFileMapper.selectSheepByManageTags(tags);
     }
 
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<Map<String, Object>> countBySheepType() {
         return sheepFileMapper.countBySheepType();
     }
 
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<Map<String, Object>> countByBreedStatus() {
         return sheepFileMapper.countByBreedStatus();
     }
 
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<Map<String, Object>> countByVariety() {
         return sheepFileMapper.countByVariety();
     }
 
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public List<Map<String, Object>> countParityOfLactation() {
         return sheepFileMapper.countParityOfLactation();
     }
 
+    @DataScope(deptAlias = "sf", userAlias = "sf")
     @Override
     public Long countInGroup() { return sheepFileMapper.countInGroup(); }
 
diff --git a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
index cc518da..8c2aa3d 100644
--- a/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
+++ b/zhyc-module/src/main/resources/mapper/base/SheepFileMapper.xml
@@ -117,36 +117,49 @@
     </select>
 
     <select id="countInGroup" resultType="java.lang.Long">
-        SELECT COUNT(*) FROM sheep_file WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
+        SELECT COUNT(*)
+        FROM sheep_file sf
+        WHERE sf.status_id = 1
+          AND (sf.is_delete = 0 OR sf.is_delete IS NULL)
+            ${params.dataScope}
     </select>
 
     <select id="countBySheepType" resultType="java.util.Map">
-        SELECT name AS name, COUNT(*) AS value
-        FROM sheep_file
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
-        GROUP BY name
+        SELECT sf.name AS name, COUNT(*) AS value
+        FROM sheep_file sf
+        WHERE sf.status_id = 1
+          AND (sf.is_delete = 0 OR sf.is_delete IS NULL)
+            ${params.dataScope}
+        GROUP BY sf.name
     </select>
 
     <select id="countByBreedStatus" resultType="java.util.Map">
-        SELECT breed AS name, COUNT(*) AS value
-        FROM sheep_file
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
-        GROUP BY breed
+        SELECT sf.breed AS name, COUNT(*) AS value
+        FROM sheep_file sf
+        WHERE sf.status_id = 1
+          AND (sf.is_delete = 0 OR sf.is_delete IS NULL)
+            ${params.dataScope}
+        GROUP BY sf.breed
     </select>
 
     <select id="countByVariety" resultType="java.util.Map">
-        SELECT variety AS name, COUNT(*) AS value
-        FROM sheep_file
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
-        GROUP BY variety
+        SELECT sf.variety AS name, COUNT(*) AS value
+        FROM sheep_file sf
+        WHERE sf.status_id = 1
+          AND (sf.is_delete = 0 OR sf.is_delete IS NULL)
+            ${params.dataScope}
+        GROUP BY sf.variety
     </select>
 
     <select id="countParityOfLactation" resultType="java.util.Map">
-        SELECT parity AS name, COUNT(*) AS value
-        FROM sheep_file
-        WHERE status_id = 1 AND name = '泌乳羊' AND (is_delete = 0 OR is_delete IS NULL)
-        GROUP BY parity
-        ORDER BY parity
+        SELECT sf.parity AS name, COUNT(*) AS value
+        FROM sheep_file sf
+        WHERE sf.status_id = 1
+          AND sf.name = '泌乳羊'
+          AND (sf.is_delete = 0 OR sf.is_delete IS NULL)
+            ${params.dataScope}
+        GROUP BY sf.parity
+        ORDER BY sf.parity
     </select>
 
     <select id="selectFieldValues" parameterType="String" resultType="String">