Browse Source

加了个orgLevel

dev_shibei_match
zxc 4 years ago
parent
commit
9268b781f8
  1. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java
  2. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyTreeResultDTO.java

@ -30,6 +30,11 @@ public class AgencyTreeResultDTO implements Serializable {
private String longitude;
//维度【没值则取跟客户的值】
private String latitude;
/**
* 前端level跟及联组件字段名一样被覆盖所以加了个一样的
*/
private String orgLevel;
/**
* 下级机关组织
*/

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@ -1119,6 +1119,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
result.setAgencyName(rootAgency.getAgencyName());
result.setAgencyId(rootAgency.getAgencyId());
result.setLevel(rootAgency.getLevel());
result.setOrgLevel(rootAgency.getLevel());
result.setLongitude(rootAgency.getLongitude());
result.setLatitude(rootAgency.getLatitude());
ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
@ -1141,6 +1142,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
resultDTO.setLevel(agency.getLevel());
resultDTO.setLongitude(agency.getLongitude());
resultDTO.setLatitude(agency.getLatitude());
resultDTO.setOrgLevel(agency.getLevel());
if (root.getSubAgencyList() == null) {
root.setSubAgencyList(new ArrayList<>());
@ -1156,6 +1158,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
grid.setAgencyName(o.getGridName());
grid.setPid(root.getAgencyId());
grid.setLevel("grid");
grid.setOrgLevel("grid");
grid.setSubAgencyList(null);
grid.setLongitude(o.getLongitude());
grid.setLatitude(o.getLatitude());

Loading…
Cancel
Save