diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/PermissionDetail.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/PermissionDetail.java index 3d3032b..7a3f1b5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/PermissionDetail.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/bean/PermissionDetail.java @@ -1,5 +1,7 @@ package com.shxy.xymanager_common.bean; +import com.shxy.xymanager_common.constant.Constants; +import com.shxy.xymanager_common.enums.CommonStatus; import lombok.Data; import java.util.ArrayList; @@ -21,7 +23,7 @@ public class PermissionDetail { private List termpList = new ArrayList<>(); - private boolean isSuper = false; + private Integer isSuper = CommonStatus.DELETE.value(); } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index 713a327..f2390f4 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -7,7 +7,6 @@ import com.shxy.xymanager_common.dto.DyLineAndTowertDto; import com.shxy.xymanager_common.entity.DyLevel; import org.apache.ibatis.annotations.Param; -import java.util.ArrayList; import java.util.List; public interface DyLevelDao { @@ -24,7 +23,7 @@ public interface DyLevelDao { List selectAll(@Param("status") Integer status); - List selectTreeList(@Param("status") Integer status, @Param("dyid")List dyplist, @Param("lineid")List lineplist, @Param("towerid")List towplist); + List selectTreeList(@Param("status") Integer status, @Param("dyid") List dyplist, @Param("lineid") List lineplist, @Param("towerid") List towplist, @Param("isSuper") Integer isSuper); List selectListTreeList( @Param("status") Integer status,@Param("list") List list); diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 33df617..e84de77 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -207,7 +207,7 @@ left join terminals d on c.id = d.tower_id ) left join terminal_status e on e.term_id = d.id) where b.status = #{status} and a.status = #{status} and c.status = #{status} and d.status = #{status} - + and ( false 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 fdb71c0..822e97c 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 @@ -30,8 +30,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static com.shxy.xymanager_common.constant.Constants.SUPER_ADMIN; - /** * 装置通道实现层 */ @@ -102,10 +100,10 @@ public class DyLevelServiceImpl implements DyLevelService { List dypList = permissionDetail.getDypList(); List linepList = permissionDetail.getLinepList(); List towerpList = permissionDetail.getTowerpList(); - boolean aSuper = permissionDetail.isSuper(); + Integer aSuper = permissionDetail.getIsSuper(); List list = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(dypList) || CollectionUtil.isNotEmpty(linepList) || CollectionUtil.isNotEmpty(towerpList) || aSuper) { - list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value(), dypList, linepList, towerpList); + if (CollectionUtil.isNotEmpty(dypList) || CollectionUtil.isNotEmpty(linepList) || CollectionUtil.isNotEmpty(towerpList) || aSuper.intValue()==1) { + list = dyLevelDao.selectTreeList(CommonStatus.EFFECTIVE.value(), dypList, linepList, towerpList,aSuper); } boolean empty = CollectionUtil.isEmpty(list); if (empty) { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java index 9b3195d..2eb3602 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java @@ -10,6 +10,7 @@ import com.shxy.xymanager_common.entity.TbPermission; import com.shxy.xymanager_common.entity.TbPermissionExample; import com.shxy.xymanager_common.entity.TbRole; import com.shxy.xymanager_common.entity.TbRoleExample; +import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.enums.PermissionDetailEnum; import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.exception.Asserts; @@ -133,7 +134,7 @@ public class RoleServiceImpl implements RoleService { } } } else { - permissionDetail.setSuper(true); + permissionDetail.setIsSuper(CommonStatus.EFFECTIVE.value()); } return permissionDetail; }