线路查询bug

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java

@@ -352,8 +352,8 @@ public class DyLevelServiceImpl implements DyLevelService {
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
         example.setGroupByClause("dy_id");
         example.setOrderByClause("dy_id desc");
-        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
         View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
             if (CollectionUtil.isNotEmpty(dypList)) {
                 criteria.andDyIdIn(dypList);
             }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java

@@ -74,8 +74,12 @@ public class LineServiceImpl implements LineService {
         TableDataInfo model = new TableDataInfo();
         String search = vo.getSearch();
         Integer dyid = vo.getDyId();
-        PermissionDetail permissionListOver = userService.getPermissionListOver();
-        List<Integer> pList = permissionListOver.getLinepList();
+
+        PermissionDetail permissionListOver = userService.getPermissionList();
+        List<Integer> dypList = permissionListOver.getDypList();
+        List<Integer> linepList = permissionListOver.getLinepList();
+        List<Integer> towerpList = permissionListOver.getTowerpList();
+        List<Integer> termpList = permissionListOver.getTermpList();
         if (StrUtil.isEmpty(search)) {
             search = null;
         } else {
@@ -86,12 +90,20 @@ public class LineServiceImpl implements LineService {
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
         example.setGroupByClause("line_id");
         example.setOrderByClause("line_id desc");
-        View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or();
-        or1.andLineIdIsNotNull();
-        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
-            if (CollectionUtil.isNotEmpty(pList)) {
+
         View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
-                criteria.andLineIdIn(pList);
+        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
+            if (CollectionUtil.isNotEmpty(dypList)) {
+                criteria.andDyIdIn(dypList);
+            }
+            if (CollectionUtil.isNotEmpty(linepList)) {
+                criteria.andLineIdIn(linepList);
+            }
+            if (CollectionUtil.isNotEmpty(towerpList)) {
+                criteria.andTowerIdIn(towerpList);
+            }
+            if (CollectionUtil.isNotEmpty(termpList)) {
+                criteria.andLineIdIn(termpList);
             }
         }
 
@@ -105,7 +117,8 @@ public class LineServiceImpl implements LineService {
             or.andLineNameLike(search);
             or.andDyNameLike(search);
         }
-
+        View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or();
+        or1.andLineIdIsNotNull();
         PageUtils.SetPage(pageindex, pagesize);
 
         List<View_Dy_Line_Tower_Terminals> list = view_dy_line_tower_terminalsDao.selectByPermission(example);

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java

@@ -87,10 +87,9 @@ public class TowerServiceImpl implements TowerService {
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
         example.setGroupByClause("tower_id");
         example.setOrderByClause("tower_id desc");
-        View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or();
-        or1.andTowerIdIsNotNull();
-        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
+
         View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
             if (CollectionUtil.isNotEmpty(dypList)) {
                 criteria.andDyIdIn(dypList);
             }
@@ -117,15 +116,14 @@ public class TowerServiceImpl implements TowerService {
         if (BeanUtil.isNotEmpty(dyid) && dyid.intValue() != -1) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
             or2.andDyIdEqualTo(dyid);
-
-
-
         }
 
         if (BeanUtil.isNotEmpty(lineId) && lineId.intValue() != -1) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
             or2.andLineIdEqualTo(lineId);
         }
+        View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or();
+        or1.andTowerIdIsNotNull();
         PageUtils.SetPage(pageindex, pagesize);
         List<View_Dy_Line_Tower_Terminals> list = view_dy_line_tower_terminalsDao.selectByPermission(example);
         boolean empty = CollectionUtil.isEmpty(list);