|
|
|
@ -439,15 +439,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
if (BeanUtil.isEmpty(dyid) || BeanUtil.isEmpty(lineid) || BeanUtil.isEmpty(towerid) || BeanUtil.isEmpty(channelid)) {
|
|
|
|
|
model.setList(beans);
|
|
|
|
|
} else {
|
|
|
|
|
List<Integer> termidlist = new ArrayList<>();
|
|
|
|
|
List<Integer> termidlist = null;
|
|
|
|
|
ArrayList<Integer> channelidlist = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
List<DyAndLineAndTowerAndTermDto> dtos = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
List<Integer> dypList = new ArrayList<>();
|
|
|
|
|
List<Integer> linepList = new ArrayList<>();
|
|
|
|
|
List<Integer> towerpList = new ArrayList<>();
|
|
|
|
|
List<Integer> termpList = new ArrayList<>();
|
|
|
|
|
List<Integer> dypList = null;
|
|
|
|
|
List<Integer> linepList = null;
|
|
|
|
|
List<Integer> towerpList = null;
|
|
|
|
|
List<Integer> termpList = null;
|
|
|
|
|
|
|
|
|
|
PermissionDetail permissionList = userService.getPermissionList();
|
|
|
|
|
if (CommonStatus.DELETE.value().equals(permissionList.getIsSuper())) {
|
|
|
|
@ -456,6 +456,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
towerpList = permissionList.getTowerpList();
|
|
|
|
|
termpList = permissionList.getTermpList();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
|
|
|
|
|
example.setGroupByClause("id");
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
|
|
|
|
@ -499,13 +500,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample.Criteria or3 = example.or();
|
|
|
|
|
or3.andIdEqualTo(termid);
|
|
|
|
|
}
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
|
|
|
|
|
or.andIdIsNotNull();
|
|
|
|
|
List<View_Dy_Line_Tower_Terminals> lists = view_dy_line_tower_terminalsDao.selectByPermission(example);
|
|
|
|
|
|
|
|
|
|
for (View_Dy_Line_Tower_Terminals item : lists) {
|
|
|
|
|
termidlist.add(item.getId());
|
|
|
|
|
if ( example.getOredCriteria().size() > 1 ) {
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
|
|
|
|
|
or.andIdIsNotNull();
|
|
|
|
|
List<View_Dy_Line_Tower_Terminals> lists = view_dy_line_tower_terminalsDao.selectByPermission(example);
|
|
|
|
|
for (View_Dy_Line_Tower_Terminals item : lists) {
|
|
|
|
|
termidlist.add(item.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (channelid == null || channelid.intValue() == -1) {
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|