代码合并

tangxiaobao

2021-07-31 377bc6f7ca8ee0e37007eeaf36bace8f54a1485a

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java

@@ -216,14 +216,12 @@
            String[] rotaPersonArray = rotaPerson.split(",");
            for (int i = 0; i <= rotaPersonArray.length - 1; i++){
                ComSwRotaPersonVO comSwRotaPersonVO = new ComSwRotaPersonVO();
                Map<String,String> person = comSwPatrolRecordDAO.getPbServiceTeamById(rotaPersonArray[i]);
                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"));
                    comSwRotaPersonVO.setName(userMap.get("name"));
                }
                rotaPersons.add(comSwRotaPersonVO);
            }
@@ -245,14 +243,12 @@
            String[] rotaPersonArray = rotaPerson.split(",");
            for (int i = 0; i <= rotaPersonArray.length - 1; i++){
                ComSwRotaPersonVO comSwRotaPersonVO = new ComSwRotaPersonVO();
                Map<String,String> leader = comSwPatrolRecordDAO.getPbServiceTeamById(rotaPersonArray[i]);
                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"));
                    comSwRotaPersonVO.setName(userMap.get("name"));
                }
                rotaLeaders.add(comSwRotaPersonVO);
            }