From e1b50dcfac1b53e00f8dc8697a630a3d72c8b16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Mon, 1 Sep 2025 15:58:31 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E5=86=9C=E5=9C=BA=E9=A6=96?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 全量查询,统计租户信息 --- .../farm/controller/admin/home/vo/HomeInfo.java | 3 +++ .../module/farm/service/home/HomeServiceImpl.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java index 212a7c45..98b120cc 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java @@ -29,6 +29,9 @@ public class HomeInfo { @Schema(description = "统计信息") private StatisticalInfo statisticalInfo; + public HomeInfo(BaseOverviewInfo baseOverviewInfo) { + this.baseOverviewInfo = baseOverviewInfo; + } @Data @AllArgsConstructor diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java index c7ce3d14..9ab74172 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java @@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.farm.service.personnelmanagement.PersonnelManagem import cn.iocoder.yudao.module.farm.service.plotinfo.PlotInfoService; import cn.iocoder.yudao.module.farm.service.productionplan.ProductionPlanService; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -55,6 +56,12 @@ public class HomeServiceImpl implements HomeService { @Override public HomeInfo getHomeInfo(String baseId) { + + if (StringUtils.isEmpty(baseId)) { + BaseOverviewInfo baseOverviewInfo = new BaseOverviewInfo(); + return new HomeInfo(baseOverviewInfo); + } + // 员工集合 Map employeeNameMap = personnelManagementService.getEmployeeNameMap(); BaseInfoDO baseObj = baseInfoService.getBaseInfo(baseId); @@ -96,8 +103,8 @@ public class HomeServiceImpl implements HomeService { List plotList = plotInfoService.getPlotInfos(baseObj.getId()); for (PlotInfoDO e : plotList) { String employeeName = personnelManagementService.getEmployeeNameMap(employeeNameMap, e.getEmployeeId()); - String beingPlotArea = productionPlanService.getBeingPlotArea(e.getId(), e.getPlotArea()); - String beingCropName = productionPlanService.getBeingCropName(e.getId()); + String beingPlotArea = productionPlanService.getBeingPlotArea(e.getPlotId(), e.getPlotArea()); + String beingCropName = productionPlanService.getBeingCropName(e.getPlotId()); targetList.add(new PlotPopupFrame(beingPlotArea,employeeName,beingCropName)); }