Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-31 cc0569d48030733d420a4cd77f3f4da405d34372

 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);
            }
        }