根据数据权限过滤

baqing-admin/src/main/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImpl.java

@@ -60,6 +60,7 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
     public List<BizMedicalResource> selectBizMedicalResourceList(BizMedicalResource query)
     {
         // 列表入参校验与类型校验须在 Controller 中、startPage() 之前完成（避免 PageHelper 分页错位）
+        applyTownDataScope(query);
         List<BizMedicalResource> list = bizMedicalResourceMapper.selectBizMedicalResourceList(query);
         if (list != null)
         {
@@ -284,6 +285,38 @@ public class BizMedicalResourceServiceImpl implements IBizMedicalResourceService
         return row;
     }
 
+    /**
+     * 乡镇/村登录人：兽医人员库仅看本镇数据（未填所属乡镇的兽医记录对乡镇账号不可见）。
+     * 非兽医类型不按乡镇收窄。
+     */
+    private void applyTownDataScope(BizMedicalResource query)
+    {
+        if (query == null)
+        {
+            return;
+        }
+        query.getParams().put("dataScope", "");
+        Long scopedTownId = townDeptSupport.resolveScopedTownDeptId();
+        if (scopedTownId == null)
+        {
+            return;
+        }
+        String type = query.getResourceType();
+        if (StringUtils.isNotEmpty(type) && !MedicalResourceRules.RESOURCE_TYPE_VET.equals(type))
+        {
+            return;
+        }
+        if (MedicalResourceRules.RESOURCE_TYPE_VET.equals(type))
+        {
+            query.getParams().put("dataScope", " AND town_dept_id = " + scopedTownId + " ");
+            return;
+        }
+        // 未传类型时：兽医按镇过滤，其余类型仍可见
+        query.getParams().put("dataScope",
+                " AND (resource_type <> '" + MedicalResourceRules.RESOURCE_TYPE_VET
+                        + "' OR town_dept_id = " + scopedTownId + ") ");
+    }
+
     /**
      * 兽医人员可选所属乡镇：校验部门并冗余乡镇名；非兽医清空。
      */

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/TownDeptSupport.java

@@ -9,11 +9,20 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 
 /**
- * 填报乡镇 / 村字典（县 → 乡镇 → 村；乡镇为县级下 order_num > 12 节点）
+ * 填报乡镇 / 村字典（县 → 乡镇 → 村；乡镇为县级下 order_num > 12 节点）。
+ * <p>
+ * 下拉范围：
+ * <ul>
+ *   <li>乡镇人员：仅本镇 + 本镇下各村</li>
+ *   <li>村级人员：仅上级乡镇 + 本村（不依赖 selectDeptList 的 @DataScope，避免查不到上级镇）</li>
+ *   <li>其余（含超管）：按部门数据权限列出填报乡镇/村</li>
+ * </ul>
  */
 @Component
 public class TownDeptSupport
@@ -23,30 +32,17 @@ public class TownDeptSupport
 
     public List<SysDept> listReportTowns()
     {
-        SysDept query = new SysDept();
-        query.setParentId(YakHerdInventoryRules.TOWN_PARENT_ID);
-        query.setStatus("0");
-        List<SysDept> depts = deptService.selectDeptList(query);
-        List<SysDept> towns = new ArrayList<>();
-        if (depts == null)
+        ReportOrgScope scope = resolveReportOrgScope();
+        if (scope.townDeptId != null)
         {
-            return towns;
-        }
-        for (SysDept dept : depts)
-        {
-            if (dept == null || !"0".equals(dept.getDelFlag()))
-            {
-                continue;
-            }
-            if (dept.getOrderNum() != null && dept.getOrderNum() > YakHerdInventoryRules.TOWN_MIN_ORDER_NUM)
+            SysDept town = deptService.selectDeptById(scope.townDeptId);
+            if (isActiveReportTown(town))
             {
-                towns.add(dept);
+                return Collections.singletonList(town);
             }
+            return Collections.emptyList();
         }
-        towns.sort((a, b) -> Integer.compare(
-                a.getOrderNum() == null ? 0 : a.getOrderNum(),
-                b.getOrderNum() == null ? 0 : b.getOrderNum()));
-        return towns;
+        return queryReportTownsByDataScope();
     }
 
     public List<SysDept> listVillagesUnderTown(Long townDeptId)
@@ -56,25 +52,21 @@ public class TownDeptSupport
         {
             return villages;
         }
-        SysDept query = new SysDept();
-        query.setParentId(townDeptId);
-        query.setStatus("0");
-        List<SysDept> depts = deptService.selectDeptList(query);
-        if (depts == null)
+        ReportOrgScope scope = resolveReportOrgScope();
+        if (scope.townDeptId != null && !scope.townDeptId.equals(townDeptId))
         {
             return villages;
         }
-        for (SysDept dept : depts)
+        if (scope.villageDeptId != null)
         {
-            if (dept != null && "0".equals(dept.getDelFlag()))
+            SysDept village = deptService.selectDeptById(scope.villageDeptId);
+            if (isActiveDept(village) && townDeptId.equals(village.getParentId()))
             {
-                villages.add(dept);
+                villages.add(village);
             }
+            return villages;
         }
-        villages.sort((a, b) -> Integer.compare(
-                a.getOrderNum() == null ? 0 : a.getOrderNum(),
-                b.getOrderNum() == null ? 0 : b.getOrderNum()));
-        return villages;
+        return queryVillagesByParent(townDeptId);
     }
 
     /**
@@ -152,7 +144,7 @@ public class TownDeptSupport
             return null;
         }
         SysDept village = deptService.selectDeptById(villageDeptId);
-        if (village == null || !"0".equals(village.getDelFlag()) || !"0".equals(village.getStatus()))
+        if (!isActiveDept(village))
         {
             return null;
         }
@@ -237,4 +229,156 @@ public class TownDeptSupport
         }
         return Collections.unmodifiableList(options);
     }
+
+    /**
+     * 当前登录人锁定的填报乡镇 id（乡镇/村人员）；非此类人员返回 null（不限制）。
+     */
+    public Long resolveScopedTownDeptId()
+    {
+        return resolveReportOrgScope().townDeptId;
+    }
+
+    /**
+     * 当前登录人是否落在填报乡镇/村：返回应锁定的乡镇、村；否则不限制（走 @DataScope 列表）。
+     */
+    ReportOrgScope resolveReportOrgScope()
+    {
+        LoginUser loginUser = tryGetLoginUser();
+        if (loginUser == null || SecurityUtils.isAdmin(loginUser.getUserId()))
+        {
+            return ReportOrgScope.unrestricted();
+        }
+        Long deptId = loginUser.getDeptId();
+        if (deptId == null && loginUser.getUser() != null)
+        {
+            deptId = loginUser.getUser().getDeptId();
+        }
+        if (deptId == null)
+        {
+            return ReportOrgScope.unrestricted();
+        }
+        SysDept self = deptService.selectDeptById(deptId);
+        if (!isActiveDept(self))
+        {
+            return ReportOrgScope.unrestricted();
+        }
+        if (isActiveReportTown(self))
+        {
+            return ReportOrgScope.townOnly(self.getDeptId());
+        }
+        if (self.getParentId() != null)
+        {
+            SysDept parent = deptService.selectDeptById(self.getParentId());
+            if (isActiveReportTown(parent))
+            {
+                return ReportOrgScope.villageOnly(parent.getDeptId(), self.getDeptId());
+            }
+        }
+        return ReportOrgScope.unrestricted();
+    }
+
+    private List<SysDept> queryReportTownsByDataScope()
+    {
+        SysDept query = new SysDept();
+        query.setParentId(YakHerdInventoryRules.TOWN_PARENT_ID);
+        query.setStatus("0");
+        List<SysDept> depts = deptService.selectDeptList(query);
+        List<SysDept> towns = new ArrayList<>();
+        if (depts == null)
+        {
+            return towns;
+        }
+        for (SysDept dept : depts)
+        {
+            if (isActiveReportTown(dept))
+            {
+                towns.add(dept);
+            }
+        }
+        towns.sort((a, b) -> Integer.compare(
+                a.getOrderNum() == null ? 0 : a.getOrderNum(),
+                b.getOrderNum() == null ? 0 : b.getOrderNum()));
+        return towns;
+    }
+
+    private List<SysDept> queryVillagesByParent(Long townDeptId)
+    {
+        List<SysDept> villages = new ArrayList<>();
+        SysDept query = new SysDept();
+        query.setParentId(townDeptId);
+        query.setStatus("0");
+        List<SysDept> depts = deptService.selectDeptList(query);
+        if (depts == null)
+        {
+            return villages;
+        }
+        for (SysDept dept : depts)
+        {
+            if (isActiveDept(dept))
+            {
+                villages.add(dept);
+            }
+        }
+        villages.sort((a, b) -> Integer.compare(
+                a.getOrderNum() == null ? 0 : a.getOrderNum(),
+                b.getOrderNum() == null ? 0 : b.getOrderNum()));
+        return villages;
+    }
+
+    static boolean isActiveReportTown(SysDept dept)
+    {
+        if (!isActiveDept(dept))
+        {
+            return false;
+        }
+        if (!Long.valueOf(YakHerdInventoryRules.TOWN_PARENT_ID).equals(dept.getParentId()))
+        {
+            return false;
+        }
+        return dept.getOrderNum() != null && dept.getOrderNum() > YakHerdInventoryRules.TOWN_MIN_ORDER_NUM;
+    }
+
+    static boolean isActiveDept(SysDept dept)
+    {
+        return dept != null && "0".equals(dept.getDelFlag()) && "0".equals(dept.getStatus());
+    }
+
+    private static LoginUser tryGetLoginUser()
+    {
+        try
+        {
+            return SecurityUtils.getLoginUser();
+        }
+        catch (Exception e)
+        {
+            return null;
+        }
+    }
+
+    static final class ReportOrgScope
+    {
+        final Long townDeptId;
+        final Long villageDeptId;
+
+        private ReportOrgScope(Long townDeptId, Long villageDeptId)
+        {
+            this.townDeptId = townDeptId;
+            this.villageDeptId = villageDeptId;
+        }
+
+        static ReportOrgScope unrestricted()
+        {
+            return new ReportOrgScope(null, null);
+        }
+
+        static ReportOrgScope townOnly(Long townDeptId)
+        {
+            return new ReportOrgScope(townDeptId, null);
+        }
+
+        static ReportOrgScope villageOnly(Long townDeptId, Long villageDeptId)
+        {
+            return new ReportOrgScope(townDeptId, villageDeptId);
+        }
+    }
 }

baqing-admin/src/main/resources/mapper/diagnosis/BizMedicalResourceMapper.xml

@@ -112,6 +112,7 @@
             <if test="queryPublishStatus != null and queryPublishStatus == 2">
                 and publish_status = 0 and offline_time is not null
             </if>
+            ${params.dataScope}
         </where>
         order by create_time desc, id desc
     </select>

baqing-admin/src/test/java/com/ruoyi/web/modules/diagnosis/service/impl/BizMedicalResourceServiceImplTest.java

@@ -11,6 +11,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.diagnosis.MedicalResourceTestSamples;
@@ -250,4 +251,30 @@ class BizMedicalResourceServiceImplTest
         verify(accountAssigner, never()).createAccount(any(), any());
         verify(mapper, never()).updateBizMedicalResource(any());
     }
+
+    @Test
+    @DisplayName("乡镇人员列表仅本镇兽医")
+    void listAppliesTownScopeForVet()
+    {
+        when(townDeptSupport.resolveScopedTownDeptId()).thenReturn(200L);
+        when(mapper.selectBizMedicalResourceList(any())).thenReturn(Collections.emptyList());
+        BizMedicalResource query = new BizMedicalResource();
+        query.setResourceType(MedicalResourceRules.RESOURCE_TYPE_VET);
+        service.selectBizMedicalResourceList(query);
+        verify(mapper).selectBizMedicalResourceList(argThat(q ->
+                String.valueOf(q.getParams().get("dataScope")).contains("town_dept_id = 200")));
+    }
+
+    @Test
+    @DisplayName("非兽医类型不按乡镇收窄")
+    void listSkipsTownScopeForNonVet()
+    {
+        when(townDeptSupport.resolveScopedTownDeptId()).thenReturn(200L);
+        when(mapper.selectBizMedicalResourceList(any())).thenReturn(Collections.emptyList());
+        BizMedicalResource query = new BizMedicalResource();
+        query.setResourceType(MedicalResourceRules.RESOURCE_TYPE_ORG);
+        service.selectBizMedicalResourceList(query);
+        verify(mapper).selectBizMedicalResourceList(argThat(q ->
+                "".equals(q.getParams().get("dataScope"))));
+    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/TownDeptSupportScopeTest.java

@@ -0,0 +1,136 @@
+package com.ruoyi.web.modules.industryservice.support;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.system.service.ISysDeptService;
+
+@ExtendWith(MockitoExtension.class)
+@DisplayName("TownDeptSupport 乡镇/村范围")
+class TownDeptSupportScopeTest
+{
+    @Mock
+    private ISysDeptService deptService;
+
+    @InjectMocks
+    private TownDeptSupport townDeptSupport;
+
+    @AfterEach
+    void clearSecurity()
+    {
+        SecurityContextHolder.clearContext();
+    }
+
+    @Test
+    @DisplayName("村级人员：乡镇下拉仅上级镇，村树仅本村")
+    void villageUserSeesParentTownAndOwnVillage()
+    {
+        SysDept town = town(200L, "雅安镇", 20);
+        SysDept village = village(300L, "雅安镇荣嘎村", 200L);
+        loginAs(300L, 9L);
+
+        when(deptService.selectDeptById(300L)).thenReturn(village);
+        when(deptService.selectDeptById(200L)).thenReturn(town);
+        when(deptService.selectDeptById(YakHerdInventoryRules.TOWN_PARENT_ID)).thenReturn(county());
+
+        List<SysDept> towns = townDeptSupport.listReportTowns();
+        assertEquals(1, towns.size());
+        assertEquals(200L, towns.get(0).getDeptId());
+
+        List<SysDept> villages = townDeptSupport.listVillagesUnderTown(200L);
+        assertEquals(1, villages.size());
+        assertEquals(300L, villages.get(0).getDeptId());
+
+        assertTrue(townDeptSupport.listVillagesUnderTown(999L).isEmpty());
+
+        List<TreeSelect> tree = townDeptSupport.buildVillageTree();
+        assertEquals(1, tree.size());
+        assertEquals(1, tree.get(0).getChildren().size());
+        assertEquals(200L, tree.get(0).getChildren().get(0).getId());
+        assertEquals(1, tree.get(0).getChildren().get(0).getChildren().size());
+        assertEquals(300L, tree.get(0).getChildren().get(0).getChildren().get(0).getId());
+    }
+
+    @Test
+    @DisplayName("乡镇人员：仅本镇")
+    void townUserSeesOwnTown()
+    {
+        SysDept town = town(200L, "雅安镇", 20);
+        loginAs(200L, 8L);
+        when(deptService.selectDeptById(200L)).thenReturn(town);
+
+        List<SysDept> towns = townDeptSupport.listReportTowns();
+        assertEquals(1, towns.size());
+        assertEquals(200L, towns.get(0).getDeptId());
+    }
+
+    @Test
+    @DisplayName("无登录上下文时仍走部门列表查询")
+    void noLoginFallsBackToDeptList()
+    {
+        SysDept town = town(200L, "雅安镇", 20);
+        when(deptService.selectDeptList(any())).thenReturn(Collections.singletonList(town));
+        assertEquals(1, townDeptSupport.listReportTowns().size());
+    }
+
+    private static void loginAs(Long deptId, Long userId)
+    {
+        SysUser user = new SysUser();
+        user.setUserId(userId);
+        user.setDeptId(deptId);
+        LoginUser loginUser = new LoginUser(userId, deptId, user, Collections.emptySet());
+        SecurityContextHolder.getContext().setAuthentication(
+                new UsernamePasswordAuthenticationToken(loginUser, null, Collections.emptyList()));
+    }
+
+    private static SysDept county()
+    {
+        SysDept d = new SysDept();
+        d.setDeptId(YakHerdInventoryRules.TOWN_PARENT_ID);
+        d.setDeptName("巴青县");
+        d.setStatus("0");
+        d.setDelFlag("0");
+        return d;
+    }
+
+    private static SysDept town(Long id, String name, int orderNum)
+    {
+        SysDept d = new SysDept();
+        d.setDeptId(id);
+        d.setDeptName(name);
+        d.setParentId(YakHerdInventoryRules.TOWN_PARENT_ID);
+        d.setOrderNum(orderNum);
+        d.setStatus("0");
+        d.setDelFlag("0");
+        return d;
+    }
+
+    private static SysDept village(Long id, String name, Long townId)
+    {
+        SysDept d = new SysDept();
+        d.setDeptId(id);
+        d.setDeptName(name);
+        d.setParentId(townId);
+        d.setOrderNum(1);
+        d.setStatus("0");
+        d.setDelFlag("0");
+        return d;
+    }
+}