回退：调整数据过滤工具，地块列表数据过滤接口，同时查询地块负责人和基地负责人

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsBlockMapper.java

@@ -88,7 +88,7 @@ public interface FmsBlockMapper
 
     public List<FmsLand> selectFmsLandByBlockIds(@Param("array") String[] blockIds, @Param("tid") String tid);
 
-    List<FmsBlock> selectFmsBlockListByManager(@Param("userId") String userId, @Param("tid") String tid);
+    List<FmsBlock> selectFmsBlockListByLandManager(@Param("userId") String userId, @Param("tid") String tid);
 
     int bindUser(FmsBlockBindUserReqVo fmsBlockBindUserReqVo);
 

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsBlockServiceImpl.java

@@ -246,8 +246,8 @@ public class FmsBlockServiceImpl implements IFmsBlockService
     }
 
     @Override
-    public List<FmsBlock> selectFmsBlockListByManager(String userId, String tid) {
-        return fmsBlockMapper.selectFmsBlockListByManager(userId,tid);
+    public List<FmsBlock> selectFmsBlockListByLandManager(String userId, String tid) {
+        return fmsBlockMapper.selectFmsBlockListByLandManager(userId,tid);
     }
 
     @Override

src/main/resources/mapper/FmsBlockMapper.xml

@@ -359,11 +359,11 @@
             </if>
         </where>
     </select>
-    <select id="selectFmsBlockListByManager" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
+    <select id="selectFmsBlockListByLandManager" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
         select * from FmsBlock
         where landId in (
             select landId from FmsLand where landManager = #{userId} and tid = #{tid}
-        ) or blockManager = #{userId}
+        )
     </select>
 
     <sql id="selectFmsPlanValidData">