羊群结构数据分离

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(); }
 

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
+        SELECT sf.name AS name, COUNT(*) AS value
-        FROM sheep_file
+        FROM sheep_file sf
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
+        WHERE sf.status_id = 1
-        GROUP BY name
+          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
+        SELECT sf.breed AS name, COUNT(*) AS value
-        FROM sheep_file
+        FROM sheep_file sf
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
+        WHERE sf.status_id = 1
-        GROUP BY breed
+          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
+        SELECT sf.variety AS name, COUNT(*) AS value
-        FROM sheep_file
+        FROM sheep_file sf
-        WHERE status_id = 1 AND (is_delete = 0 OR is_delete IS NULL)
+        WHERE sf.status_id = 1
-        GROUP BY variety
+          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
+        SELECT sf.parity AS name, COUNT(*) AS value
-        FROM sheep_file
+        FROM sheep_file sf
-        WHERE status_id = 1 AND name = '泌乳羊' AND (is_delete = 0 OR is_delete IS NULL)
+        WHERE sf.status_id = 1
-        GROUP BY parity
+          AND sf.name = '泌乳羊'
-        ORDER BY parity
+          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">