Browse Source

update:站点列表deptId不为空时取其及子部门中stationId不为空的机构id

show
luyie 6 days ago
parent
commit
4ad23e8497
  1. 31
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

31
hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java

@ -593,13 +593,42 @@ public class StationServiceImpl extends BaseServiceImpl<StationMapper, StationEn
*/ */
@Override @Override
public List<StationEntity> getStationList(List<Dept> authList, Long deptId, List<Integer> types, Integer servrType, boolean make) { public List<StationEntity> getStationList(List<Dept> authList, Long deptId, List<Integer> types, Integer servrType, boolean make) {
List<Long> refDepList;
if (null != deptId) {
// 取此部门及其所有子部门中已绑定站点的机构(stationId 不为空)
List<Long> deptIds = new ArrayList<>();
deptIds.add(deptId);
this.getChildDeptIds(authList, deptId, deptIds);
refDepList = authList.stream().filter(o -> deptIds.contains(o.getId()) && StringUtils.isNotBlank(o.getStationId())).map(Dept::getId).collect(Collectors.toList());
} else {
// 取权限机构中已绑定站点的机构(stationId 不为空) // 取权限机构中已绑定站点的机构(stationId 不为空)
List<Long> refDepList = authList.stream().filter(o -> StringUtils.isNotBlank(o.getStationId())).map(Dept::getId).collect(Collectors.toList()); refDepList = authList.stream().filter(o -> StringUtils.isNotBlank(o.getStationId())).map(Dept::getId).collect(Collectors.toList());
}
// 获取水利站点(过滤其他站点类型) // 获取水利站点(过滤其他站点类型)
return this.getWaterList(refDepList, types, servrType, make); return this.getWaterList(refDepList, types, servrType, make);
} }
/** /**
* 递归获取子机构id集合
*
* @param departList
* @param deptId
* @param list
* @return
*/
private void getChildDeptIds(List<Dept> departList, Long deptId, List<Long> list) {
if (null == deptId || CollectionUtil.isEmpty(departList)) {
return;
}
departList.forEach(dept -> {
if (deptId.equals(dept.getParentId())) {
list.add(dept.getId());
getChildDeptIds(departList, dept.getId(), list);
}
});
}
/**
* 获取参数类型站点(过滤其他站点类型) * 获取参数类型站点(过滤其他站点类型)
* *
* @param refDepList * @param refDepList

Loading…
Cancel
Save