From cc0569d48030733d420a4cd77f3f4da405d34372 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期六, 31 七月 2021 21:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
index 6875d1a..8cfc33f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -220,6 +220,11 @@
comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
comSwRotaPersonVO.setName(person.get("name"));
comSwRotaPersonVO.setPhone(Long.valueOf(person.get("phone")));
+ Map<String,String> userMap = this.comSwRotaDAO.getImageUrl(Long.valueOf(rotaPersonArray[i]));
+ if(userMap != null){
+ comSwRotaPersonVO.setPhone(userMap.get("phone"));
+ comSwRotaPersonVO.setImageUrl(userMap.get("url"));
+ }
rotaPersons.add(comSwRotaPersonVO);
}
}
@@ -244,6 +249,11 @@
comSwRotaPersonVO.setId(Long.valueOf(rotaPersonArray[i]));
comSwRotaPersonVO.setName(leader.get("name"));
comSwRotaPersonVO.setPhone(Long.valueOf(leader.get("phone")));
+ Map<String,String> userMap = this.comSwRotaDAO.getImageUrl(Long.valueOf(rotaPersonArray[i]));
+ if(userMap != null){
+ comSwRotaPersonVO.setPhone(userMap.get("phone"));
+ comSwRotaPersonVO.setImageUrl(userMap.get("url"));
+ }
rotaLeaders.add(comSwRotaPersonVO);
}
}
--
Gitblit v1.7.1