From 6c0af7790f972e8a186a88d67e408498903d9eeb Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:44:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
index ad70165..430470e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -214,15 +214,15 @@
@Override
public R exportDangerReport(List<Long> dangerReportIds) {
List<ComSwDangerReportExcelVO> list = comSwDangerReportDAO.exportDangerReport(dangerReportIds);
- list.forEach(comSwDangerReportExcelVO -> {
- List<String> patrolUserIds = Arrays.asList(comSwDangerReportExcelVO.getPatrolPerson().split(","));
- List<String> patrolPhones = new ArrayList<>();
- for (String userId : patrolUserIds) {
- LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
- patrolPhones.add(loginUserInfoVO.getPhone());
- }
- comSwDangerReportExcelVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
- });
+// list.forEach(comSwDangerReportExcelVO -> {
+// List<String> patrolUserIds = Arrays.asList(comSwDangerReportExcelVO.getPatrolPerson().split(","));
+// List<String> patrolPhones = new ArrayList<>();
+// for (String userId : patrolUserIds) {
+// LoginUserInfoVO loginUserInfoVO = userService.getUserInfoByUserId(userId).getData();
+// patrolPhones.add(loginUserInfoVO.getPhone());
+// }
+// comSwDangerReportExcelVO.setPatrolPersonPhone(StringUtils.join(patrolPhones,","));
+// });
return R.ok(list);
}
}
--
Gitblit v1.7.1