合并分支 'dev' 到 'master'

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -281,7 +281,7 @@ public class UnitsServiceImpl implements UnitsService {
         if (belongsArea.getType()==1){
             //把省直属组合一下 直属单位（type=2） 处室单位（type=4）
 //            leftNavigationList.addAll(unitsDao.findAllByType(4).stream().map(Units::toLeftNavigation).collect(Collectors.toList()));
-            List<LeftNavigation> leftNavigationList2=unitsDao.findAllByType(2).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
+            List<LeftNavigation> leftNavigationList2=unitsDao.findAllByType(2).stream().filter(units1 -> !units1.getName().equals("省应急小组")&& !units1.getName().equals("省机科技管理处")&& !units1.getName().equals("省机通信报务处") && units1.getEscrow()==1).map(Units::toLeftNavigation).collect(Collectors.toList());
             LeftNavigation leftNavigation2=new LeftNavigation(0,"省直属",leftNavigationList2, UUID.randomUUID().toString(),1,22,null);
             leftNavigationList.add(leftNavigation2);
         }