diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index ad16e26..7b0d30a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/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"); + View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) { - View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); if (CollectionUtil.isNotEmpty(dypList)) { criteria.andDyIdIn(dypList); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index 7de7070..b91c0ac 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/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 pList = permissionListOver.getLinepList(); + + PermissionDetail permissionListOver = userService.getPermissionList(); + List dypList = permissionListOver.getDypList(); + List linepList = permissionListOver.getLinepList(); + List towerpList = permissionListOver.getTowerpList(); + List 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(); + + View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) { - if (CollectionUtil.isNotEmpty(pList)) { - View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); - criteria.andLineIdIn(pList); + 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 list = view_dy_line_tower_terminalsDao.selectByPermission(example); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java index 7ad65ae..981d2d1 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TowerServiceImpl.java +++ b/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(); + + View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) { - View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria(); 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 list = view_dy_line_tower_terminalsDao.selectByPermission(example); boolean empty = CollectionUtil.isEmpty(list);