调整数据过滤工具，基地列表的数据过滤受用户被绑定的地块影响

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -197,7 +197,7 @@ public class FmsBlockController extends BaseController
     @PostMapping("/bind/user")
     public AjaxResult bindUser(@Valid @RequestBody FmsBlockBindUserReqVo fmsBlockBindUserReqVo){
         fmsBlockBindUserReqVo.setTid(SecurityUtils.getTid());
-      return AjaxResult.success(fmsBlockService.bindUser(fmsBlockBindUserReqVo));
+        return AjaxResult.success(fmsBlockService.bindUser(fmsBlockBindUserReqVo));
     }
 
     @GetMapping("/user/bind/list")

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsConsoleController.java

@@ -99,7 +99,7 @@ public class FmsConsoleController {
         Map<String, Object> resultMap = new HashMap<>();
 
         try {
-            JSONObject resultObj = weatherService.getProjectWeather("7");
+            JSONObject resultObj = weatherService.getProjectWeather();
             String city = resultObj.getString("city");
             String province = resultObj.getString("province");
             String district = resultObj.getString("district");

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

@@ -5,6 +5,7 @@ import com.yunfeiyun.agmp.common.framework.web.service.ISysRoleService;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsBlock;
 import com.yunfeiyun.agmp.fms.domain.FmsLand;
+import com.yunfeiyun.agmp.fms.mapper.FmsBlockMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsBlockService;
 import com.yunfeiyun.agmp.fms.service.IFmsLandService;
 import com.yunfeiyun.agmp.fms.service.IWmsWarehouseService;
@@ -30,32 +31,22 @@ public class DataAuthUtil
     private ISysRoleService sysRoleService;
     @Autowired
     private IWmsWarehouseService wmsWarehouseService;
+    @Autowired
+    private FmsBlockMapper fmsBlockMapper;
 
     /**
      * 查询分配的基地列表
      */
     public List<String> landList() {
-        FmsLand fmsLand = new FmsLand();
-        List<FmsLand> fmsLands = fmsLandService.selectFmsLandList(fmsLand);
-        List<String> list = new ArrayList<>();
-        for (FmsLand land : fmsLands) {
-            list.add(land.getLandId());
-        }
-        return list;
+        return landListOfBlock();
     }
 
     /**
      * 查询基地列表(包含所分配的基地以及所分配地块所属的基地)
      */
     public List<String> landListOfBlock() {
-
-        List<String> list = this.landList();
-        FmsBlock fmsBlock = new FmsBlock();
-        List<FmsBlock> blocks = fmsBlockService.selectFmsBlockList(fmsBlock);
-        for (FmsBlock block : blocks) {
-            list.add(block.getLandId());
-        }
-        return list.stream().distinct().collect(Collectors.toList());
+        List<FmsLand> fmsLands = fmsBlockMapper.selectFmsLandByBlockIds(this.blockList().toArray(new String[]{}),SecurityUtils.getTid());
+        return fmsLands.stream().map(FmsLand::getLandId).collect(Collectors.toList());
     }
 
     /**