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

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> selectFmsBlockListByLandManager(@Param("userId") String userId, @Param("tid") String tid);
+    List<FmsBlock> selectFmsBlockListByManager(@Param("userId") String userId, @Param("tid") String tid);
 
     int bindUser(FmsBlockBindUserReqVo fmsBlockBindUserReqVo);
 

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsBlockService.java

@@ -81,7 +81,7 @@ public interface IFmsBlockService
      */
     public List<FmsBlockResVo> selectFmsBlockHasPlan(FmsBlockReqVo reqVo);
 
-    List<FmsBlock> selectFmsBlockListByLandManager(String userId, String tid);
+    List<FmsBlock> selectFmsBlockListByManager(String userId, String tid);
 
     int bindUser(FmsBlockBindUserReqVo fmsBlockBindUserReqVo);
 

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

@@ -88,7 +88,7 @@ public class FmsBlockServiceImpl implements IFmsBlockService
         fmsBlock.setBlockId(fmsBlock.getId());
         fmsBlock.setBlockAreaplant(new BigDecimal("0"));
         // TODO: 昌黎定制版的地块的租户标识来源于基地标识
-        fmsBlock.setTid(fmsBlock.getLandId());
+        fmsBlock.setTid(SecurityUtils.getTid());
         int i = fmsBlockMapper.insertFmsBlock(fmsBlock);
 
         Integer count = fmsBlockMapper.selectCountByLandId(fmsBlock.getLandId(),fmsLand.getLandId());
@@ -105,7 +105,7 @@ public class FmsBlockServiceImpl implements IFmsBlockService
             }
         }
         fmsLand.setLandBlockcount(Long.valueOf(count));
-        fmsLand.setTid(fmsLand.getLandId());
+        fmsLand.setTid(SecurityUtils.getTid());
         fmsLandMapper.updateFmsLand(fmsLand);
 
         String resIdsStr = fmsBlock.getResIds();
@@ -130,12 +130,12 @@ public class FmsBlockServiceImpl implements IFmsBlockService
     @Override
     public AjaxResult updateFmsBlock(FmsBlock fmsBlock, FmsLand fmsLand) {
         // TODO 此处涉及admin角色修改地块基地
-        fmsBlock.setTid(fmsBlock.getLandId());
-        fmsLand.setTid(fmsBlock.getLandId());
+        fmsBlock.setTid(SecurityUtils.getTid());
+        fmsLand.setTid(SecurityUtils.getTid());
         fmsBlockMapper.updateFmsBlock(fmsBlock);
         FmsLand fmsLand1 = new FmsLand();
         fmsLand1.setLandId(fmsBlock.getLandId());
-        fmsLand1.setTid(fmsBlock.getLandId());
+        fmsLand1.setTid(SecurityUtils.getTid());
         BigDecimal sum = fmsBlockMapper.selectSumAreaByLandId(fmsLand1);
         if (sum.compareTo(fmsLand.getLandArea()) == 1) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -246,8 +246,8 @@ public class FmsBlockServiceImpl implements IFmsBlockService
     }
 
     @Override
-    public List<FmsBlock> selectFmsBlockListByLandManager(String userId, String tid) {
-        return fmsBlockMapper.selectFmsBlockListByLandManager(userId,tid);
+    public List<FmsBlock> selectFmsBlockListByManager(String userId, String tid) {
+        return fmsBlockMapper.selectFmsBlockListByManager(userId,tid);
     }
 
     @Override

src/main/java/com/yunfeiyun/agmp/fms/util/DataAuthUtil.java

@@ -75,8 +75,8 @@ public class DataAuthUtil
                 list.add(block.getBlockId());
             }
         }
-        // 查询基地负责人所属地块
-        List<FmsBlock> fmsBlocks = fmsBlockService.selectFmsBlockListByLandManager(SecurityUtils.getUserId(), SecurityUtils.getTid());
+        // 查询负责人所属地块
+        List<FmsBlock> fmsBlocks = fmsBlockService.selectFmsBlockListByManager(SecurityUtils.getUserId(), SecurityUtils.getTid());
         // 合并两个地块列表，并对地块标识进行去重
         return Stream.concat(list.stream(),fmsBlocks.stream().map(FmsBlock::getBlockId)).distinct().collect(Collectors.toList());
     }

src/main/resources/mapper/FmsBlockMapper.xml

@@ -359,11 +359,11 @@
             </if>
         </where>
     </select>
-    <select id="selectFmsBlockListByLandManager" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
+    <select id="selectFmsBlockListByManager" 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">