|
@@ -113,11 +113,13 @@ public class FmsBlockController extends BaseController {
|
|
|
if (b) {
|
|
if (b) {
|
|
|
//true需要进行权限校验。下拉框基地列表查询需要包含分配的基地以及分配地块所属基地
|
|
//true需要进行权限校验。下拉框基地列表查询需要包含分配的基地以及分配地块所属基地
|
|
|
List<String> strings = dataAuthUtil.landList();
|
|
List<String> strings = dataAuthUtil.landList();
|
|
|
|
|
+ List<String> blockIds = dataAuthUtil.blockList();
|
|
|
if (strings.isEmpty()) {
|
|
if (strings.isEmpty()) {
|
|
|
return AjaxResult.success(new ArrayList<>());
|
|
return AjaxResult.success(new ArrayList<>());
|
|
|
}
|
|
}
|
|
|
fmsBlock.setDataFilter(true);
|
|
fmsBlock.setDataFilter(true);
|
|
|
fmsBlock.setLandIds(strings);
|
|
fmsBlock.setLandIds(strings);
|
|
|
|
|
+ fmsBlock.setBlockIds(blockIds);
|
|
|
}
|
|
}
|
|
|
FmsLand fmsLandQuery = new FmsLand();
|
|
FmsLand fmsLandQuery = new FmsLand();
|
|
|
fmsLandQuery.setLandIds(fmsBlock.getLandIds());
|
|
fmsLandQuery.setLandIds(fmsBlock.getLandIds());
|