diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
index 5fdd0567d..6000d96eb 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineReportServiceImpl.java
@@ -148,13 +148,6 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
                 DateUtil.endOfDay(DateUtil.parse(supervisionTempLineReportQuery.getSearchEndTime())));
         queryWrapper.orderByDesc("supervision_temp_line_report.Update_Time");
         Page<SupervisionTempLineReportVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(supervisionTempLineReportQuery), PageFactory.getPageSize(supervisionTempLineReportQuery)), queryWrapper);
-        page.getRecords().stream().forEach(temp->{
-//            temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgId()).getData().getName()));
-            //处理特殊字段，用户名、部门名
-            UserVO userVO = userFeignClient.getUserById(temp.getReporter()).getData();
-            temp.setReporter(userVO.getName());
-            temp.setOrgName(deptFeignClient.getDeptById(temp.getOrgId()).getData().getName());
-        });
         return page;
     }
 
@@ -186,7 +179,7 @@ public class SupervisionTempLineReportServiceImpl extends ServiceImpl<Supervisio
         BeanUtils.copyProperties(byId,vo);
 
         //处理特殊字段，用户名、部门名
-        UserVO userVO = userFeignClient.getUserById(vo.getReporter()).getData();
+        UserVO userVO = userFeignClient.getUserById(vo.getCreateBy()).getData();
         vo.setReporter(userVO.getName());
         vo.setOrgName(deptFeignClient.getDeptById(vo.getOrgId()).getData().getName());
         vo.setLoadType(dictTreeFeignClient.queryById(vo.getLoadType()).getData().getName());
diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
index 7afa6ab3d..a53cb0961 100644
--- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
+++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
@@ -406,27 +406,29 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
     @Transactional(rollbackFor = Exception.class)
     public void updateUserStatus(String lineId, Integer userStatus) {
         SupervisionTempLineReport supervisionTempLineReport = supervisionTempLineReportMapper.selectById(lineId);
-        String userId = supervisionTempLineReport.getUserId();
-        UserReportPO userReportPO = this.baseMapper.selectById(userId);
-        //如果目前的干扰源用户状态>userStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改
-        if (userReportPO.getUserStatus() < userStatus) {
-            if (userStatus == 3) {
-                List<SupervisionTempLineReport> supervisionTempLineReports = supervisionTempLineReportMapper.selectList(new QueryWrapper<SupervisionTempLineReport>().lambda().eq(SupervisionTempLineReport::getUserId, userId));
-                List<String> lineIds = supervisionTempLineReports.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList());
-                List<LineDetail> data = lineFeignClient.getLineDetail(lineIds).getData();
-                List<Integer> collect1 = data.stream().filter(temp -> !Objects.equals(temp.getId(), lineId))
-                        .map(LineDetail::getRunFlag)
-                        .filter(temp -> !Objects.equals(temp, 2))
-                        .collect(Collectors.toList());
-                if (CollectionUtil.isEmpty(data)) {
+        if(Objects.nonNull(supervisionTempLineReport)) {
+            String userId = supervisionTempLineReport.getUserId();
+            UserReportPO userReportPO = this.baseMapper.selectById(userId);
+            //如果目前的干扰源用户状态>userStatus则不修改，如果将干扰源用户状态改为3退运，则必须其下的监测点都退运才能修改
+            if (userReportPO.getUserStatus() < userStatus) {
+                if (userStatus == 3) {
+                    List<SupervisionTempLineReport> supervisionTempLineReports = supervisionTempLineReportMapper.selectList(new QueryWrapper<SupervisionTempLineReport>().lambda().eq(SupervisionTempLineReport::getUserId, userId));
+                    List<String> lineIds = supervisionTempLineReports.stream().map(SupervisionTempLineReport::getId).collect(Collectors.toList());
+                    List<LineDetail> data = lineFeignClient.getLineDetail(lineIds).getData();
+                    List<Integer> collect1 = data.stream().filter(temp -> !Objects.equals(temp.getId(), lineId))
+                            .map(LineDetail::getRunFlag)
+                            .filter(temp -> !Objects.equals(temp, 2))
+                            .collect(Collectors.toList());
+                    if (CollectionUtil.isEmpty(data)) {
+                        userReportPO.setUserStatus(userStatus);
+                    }
+                } else {
                     userReportPO.setUserStatus(userStatus);
-                }
-            } else {
-                userReportPO.setUserStatus(userStatus);
 
+                }
             }
+            this.updateById(userReportPO);
         }
-        this.updateById(userReportPO);
     }
 
     @Override