Merge branch 'dev' of git.yfzx.zjtys.com.cn:matrix/device-back

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

@@ -298,6 +298,7 @@ public class UnitsServiceImpl implements UnitsService {
         return leftNavigation;
     }
 
+
     @Override
     public LeftNavigation findLeftNavigation1(SecurityUser securityUser) {
         LeftNavigation leftNavigation=new LeftNavigation();
@@ -317,7 +318,7 @@ public class UnitsServiceImpl implements UnitsService {
             leftNavigationList.add(units);
             //把省直属组合一下 直属单位（type=2） 处室单位（type=4）
 //            leftNavigationList.addAll(unitsDao.findAllByType(4).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("省机通信报务处")).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);
         }
@@ -325,7 +326,6 @@ public class UnitsServiceImpl implements UnitsService {
             leftNavigation = belongsArea.toLeftNavigation();
             leftNavigationList =  unitsDao.findAllByAreaId(belongsArea.getId()).stream().map(Units::toLeftNavigation).collect(Collectors.toList());
         }
-
         List<Area> areas= areaDao.findAllByFatherId(areaId).stream().filter(area -> area.getType() <= 3).collect(Collectors.toList());
         if (areas.size()!=0) {
             provinceAndCity(belongsArea,areas,leftNavigationList);
@@ -339,13 +339,15 @@ public class UnitsServiceImpl implements UnitsService {
         return leftNavigation;
     }
 
+
     @Override
     public LeftNavigation findLeftNavigation2(SecurityUser securityUser) {
-        List<LeftNavigation> leftNavigationList2=unitsDao.findAllByType(2).stream().filter(units1 -> !units1.getName().equals("省机科技管理处")&& !units1.getName().equals("省机通信报务处")).map(Units::toLeftNavigation).collect(Collectors.toList());
+        List<LeftNavigation> leftNavigationList2=unitsDao.findAllByType(2).stream().filter(units1 -> !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);
         return leftNavigation2;
     }
 
+
     @Override
     public LeftNavigation findLeftNavigationNotDirectlyUnit(SecurityUser securityUser) {
         LeftNavigation leftNavigation=new LeftNavigation();