监控报表机构名称错误

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -101,6 +101,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         if (null == monitoringAccessDTO.getOrgId()) {
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }
+        Long orgId=monitoringAccessDTO.getOrgId();
         //判断机构类型,如果机构类型大于行社，都展示行社数据
         SysOrg sysOrg = remoteOrgService.selectSysOrgById(monitoringAccessDTO.getOrgId(), SecurityConstants.INNER);
         List<SysOrg> sysOrgs;
@@ -129,7 +130,7 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
-            Long orgId=monitoringAccessDTO.getOrgId();
+            Long condOrgId=monitoringAccessDTO.getOrgId();
             monitoringAccessDTO.setOrgId(null);
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
             String avg = monitorAccessReportMapper.avg(monitoringAccessDTO);
@@ -147,6 +148,8 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessVO.setPlanAccessNumber(monitoringAccessVO1.getPlanAccessNumber());
             monitoringAccessVO.setRealityAccessNumber(monitoringAccessVO1.getRealityAccessNumber());
             monitoringAccessVOList.add(monitoringAccessVO);
+
+            monitoringAccessDTO.setOrgId(condOrgId);
         });
         return monitoringAccessVOList;
     }