From df02c759d988bd3560b3f85da1d2b65f532b0147 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 16 May 2024 19:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SupervisionDevMainReportPOServiceImpl.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
index f079f2957..ad1352b1a 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
@@ -132,7 +132,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         queryWrapper.orderByDesc("supervision_dev_main_report.Update_Time");
         Page<SupervisionDevMainReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionDevMainReportQuery), PageFactory.getPageSize(supervisionDevMainReportQuery)), queryWrapper);
         page.getRecords().stream().forEach(temp->{
-            temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
+//            temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
             //处理特殊字段，用户名、部门名
             UserVO userVO = userFeignClient.getUserById(temp.getReporter()).getData();
             temp.setReporter(userVO.getName());
@@ -181,8 +181,12 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
         SupervisionDevMainReportVO supervisionDevMainReportVO = new SupervisionDevMainReportVO();
         SupervisionDevMainReportPO byId = this.getById(id);
         BeanUtils.copyProperties(byId,supervisionDevMainReportVO);
-        //获取普测下电站详情
+        UserVO userVO = userFeignClient.getUserById(byId.getReporter()).getData();
+        supervisionDevMainReportVO.setReporter(userVO.getName());
+        supervisionDevMainReportVO.setOrgName(deptFeignClient.getDeptById(byId.getOrgId()).getData().getName());
+
         SupervisionTempDeviceReport supervisionTempDeviceReport = supervisionTempDeviceReportService.lambdaQuery().eq(SupervisionTempDeviceReport::getId, id).one();
+
         supervisionDevMainReportVO.setSupervisionTempDeviceReport(supervisionTempDeviceReport);
         return supervisionDevMainReportVO;
     }