diff --git a/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java b/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java index d6443ac..96f70a4 100644 --- a/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java @@ -6,9 +6,18 @@ * @email : 290677893@qq.com **/ public class PersonPhoneBean { + private String personDept; private String personName; private String personPhone; + public String getPersonDept() { + return personDept; + } + + public void setPersonDept(String personDept) { + this.personDept = personDept; + } + public String getPersonName() { return personName; } diff --git a/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java b/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java index d6443ac..96f70a4 100644 --- a/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java +++ b/app/src/main/java/com/casic/dcms/bean/PersonPhoneBean.java @@ -6,9 +6,18 @@ * @email : 290677893@qq.com **/ public class PersonPhoneBean { + private String personDept; private String personName; private String personPhone; + public String getPersonDept() { + return personDept; + } + + public void setPersonDept(String personDept) { + this.personDept = personDept; + } + public String getPersonName() { return personName; } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java index f680234..847d5ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PhonePageFragment.java @@ -36,7 +36,6 @@ private DeptTreePresenterImpl deptTreePresenter; private PhoneBookPresenterImpl phoneBookPresenter; private List deptList = new ArrayList<>();//部门名集合 - private List personPhones = new ArrayList<>();//个人信息集合 private List> deptAndPersons = new ArrayList<>();//个人信息集合的集合 private DeptExpandableAdapter expandableAdapter; @@ -85,16 +84,21 @@ // Log.d(TAG, "obtainPhoneBookResult: " + new Gson().toJson(resultBean)); if (resultBean.isSuccess()) { List dataBeans = resultBean.getData(); - personPhones.clear(); - for (PhoneBookBean.DataBean bean : dataBeans) { - PersonPhoneBean personPhoneBean = new PersonPhoneBean(); - personPhoneBean.setPersonName(bean.getName()); - personPhoneBean.setPersonPhone(bean.getPhone()); - personPhones.add(personPhoneBean); - } - //整体打包装入集合 deptAndPersons.clear(); - deptAndPersons.add(personPhones); + for (String title : deptList) { + List beanList = new ArrayList<>(); + for (PhoneBookBean.DataBean dataBean : dataBeans) { + if (title.equals(dataBean.getDeptName())) { + PersonPhoneBean phoneBean = new PersonPhoneBean(); + phoneBean.setPersonDept(dataBean.getDeptName()); + phoneBean.setPersonName(dataBean.getName()); + phoneBean.setPersonPhone(dataBean.getPhone()); + + beanList.add(phoneBean); + } + } + deptAndPersons.add(beanList); + } //展示部门树以及人员 expandableAdapter.setData(deptList, deptAndPersons); deptTreeView.setAdapter(expandableAdapter);