|
|
@@ -2,9 +2,7 @@ package com.hz.pm.api.user.manage; |
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
|
import cn.hutool.core.collection.ListUtil; |
|
|
|
import cn.hutool.core.text.CharSequenceUtil; |
|
|
|
import cn.hutool.core.util.ObjUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
@@ -107,7 +105,7 @@ public class MhUnitManage { |
|
|
|
List<MhUnitTreeDTO> nodes = allUnits.stream() |
|
|
|
.filter(w -> MhUnitTypeEnum.SASAC.equals(w.getType()) || |
|
|
|
((MhUnitTypeEnum.REGION.equals(w.getType()) || MhUnitTypeEnum.NODE.equals(w.getType())) |
|
|
|
&& w.getName().endsWith(MhUnitConst.UNIT_XCB))) |
|
|
|
&& (w.getName().endsWith(MhUnitConst.UNIT_XCB) || UNIT_HZ.equals(w.getName())))) |
|
|
|
.map(w -> BeanUtil.copyProperties(w, MhUnitTreeDTO.class)) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
mhUnitOptionSort(nodes); |
|
|
@@ -136,6 +134,7 @@ public class MhUnitManage { |
|
|
|
((MhUnitTypeEnum.REGION.equals(w.getType()) || MhUnitTypeEnum.NODE.equals(w.getType())) |
|
|
|
&& (w.getName().endsWith(UNIT_XCB) |
|
|
|
|| CITY_SELF.equals(w.getName()) |
|
|
|
|| CITY_SELF_ALIAS.equals(w.getName()) |
|
|
|
|| UNIT_HZ.equals(w.getName()) |
|
|
|
|| COUNTY_SELF.equals(w.getName())))) |
|
|
|
.map(w -> { |
|
|
|