|
|
@@ -120,7 +120,7 @@ public class FmsBlockController extends BaseController {
|
|
|
fmsBlock.setLandIds(strings);
|
|
|
}
|
|
|
FmsLand fmsLandQuery = new FmsLand();
|
|
|
- fmsLandQuery.setBlockIds(fmsBlock.getLandIds());
|
|
|
+ fmsLandQuery.setLandIds(fmsBlock.getLandIds());
|
|
|
fmsLandQuery.setTid(SecurityUtils.getTid());
|
|
|
//查询基地列表
|
|
|
List<FmsLand> list = fmsLandService.selectFmsLandList(fmsLandQuery);
|
|
|
@@ -239,8 +239,11 @@ public class FmsBlockController extends BaseController {
|
|
|
blockIds.add(fmsBlock.getBlockId());
|
|
|
userIds.add(fmsBlock.getBlockManager());
|
|
|
}
|
|
|
- List<SysUser> sysUserList = sysUserMapper.selectUserListByUserIds(userIds);
|
|
|
- Map<String,SysUser> userMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId,item->item));
|
|
|
+ Map<String,SysUser> userMap = new HashMap<>();
|
|
|
+ if(!userIds.isEmpty()){
|
|
|
+ List<SysUser> sysUserList = sysUserMapper.selectUserListByUserIds(userIds);
|
|
|
+ userMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId,item->item));
|
|
|
+ }
|
|
|
// 查询地块种植计划
|
|
|
FmsPlanReqVo fmsPlanQuery = new FmsPlanReqVo();
|
|
|
fmsPlanQuery.setBlockIds(blockIds);
|