diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseMonitorunitInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseMonitorunitInfoController.java
index 5a9958d..d47bb7b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseMonitorunitInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/BaseMonitorunitInfoController.java
@@ -70,7 +70,7 @@ public class BaseMonitorunitInfoController extends BaseController {
     List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos = new ArrayList<>();
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(ShiroUtils.getLoginName().equals("admin")){
       List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos1 =
@@ -304,7 +304,7 @@ public class BaseMonitorunitInfoController extends BaseController {
     List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos = new ArrayList<>();
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(ShiroUtils.getLoginName().equals("admin")){
       List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos1 =
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/DeviceMonitorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/DeviceMonitorController.java
index b1dc0b2..22de437 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/DeviceMonitorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/DeviceMonitorController.java
@@ -66,7 +66,7 @@ public class DeviceMonitorController {
       List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos = new ArrayList<>();
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
       if(ShiroUtils.getLoginName().equals("admin")){
           List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos1 =
@@ -131,7 +131,7 @@ public class DeviceMonitorController {
       List<BaseMonitorunitInfoDto> baseMonitorunitInfos = new ArrayList<>();
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
       if(ShiroUtils.getLoginName().equals("admin")){
           List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos1 =
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
index 2278d4a..a589db0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/IndexController.java
@@ -69,7 +69,7 @@ public class IndexController {
 
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
       if(!ShiroUtils.getLoginName().equals("admin")){
         for (SysRole sysRole : sysRoles) {
           //
@@ -159,7 +159,7 @@ public class IndexController {
       List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtoList = new ArrayList<BaseMonitorunitInfoDto>();
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
       if(!ShiroUtils.getLoginName().equals("admin")){
         for (SysRole sysRole : sysRoles) {
@@ -237,7 +237,7 @@ public class IndexController {
 
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
       List<BaseSensorInfoDto> baseSensorInfoDtos = new ArrayList<>();
       if(!ShiroUtils.getLoginName().equals("admin")){
@@ -324,7 +324,7 @@ public class IndexController {
 
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
 
       baseSensorTypeList.forEach(
@@ -405,7 +405,7 @@ public class IndexController {
 
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
       if(!ShiroUtils.getLoginName().equals("admin")){
         for (SysRole sysRole : sysRoles) {
@@ -465,7 +465,7 @@ public class IndexController {
       List<RecordAlarm> recordAlarms = new ArrayList<>();
       SysUser sysUser = ShiroUtils.getSysUser();
 
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
       for (SysRole sysRole : sysRoles) {
         RecordAlarm recordAlarm = new RecordAlarm();
         recordAlarm.setRoleId(sysRole.getRoleId());
@@ -550,7 +550,7 @@ public class IndexController {
       List<RecordAlarmDto> recordAlarmDtos1 = recordAlarmService.selectAlarmTrendList("");
       recordAlarmDtos.addAll(recordAlarmDtos1);
     }else{
-      List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+      List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
       for (SysRole sysRole : sysRoles) {
         RecordAlarm recordAlarm = new RecordAlarm();
         recordAlarm.setRoleId(sysRole.getRoleId());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/SensorSummaryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/SensorSummaryController.java
index e36f80a..80f0acb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/SensorSummaryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/SensorSummaryController.java
@@ -77,7 +77,7 @@ public class SensorSummaryController extends BaseController {
 
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(ShiroUtils.getLoginName().equals("admin")){
       List<BaseSensorInfoDto> baseSensorInfoDto =
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/WisdomScenarioContorller.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/WisdomScenarioContorller.java
index bd4c8f9..6296279 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/WisdomScenarioContorller.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/WisdomScenarioContorller.java
@@ -63,7 +63,7 @@ public class WisdomScenarioContorller extends BaseController {
 
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(!ShiroUtils.getLoginName().equals("admin")){
       for (SysRole sysRole : sysRoles) {
@@ -136,7 +136,7 @@ public class WisdomScenarioContorller extends BaseController {
     List<BaseMonitorunitInfoDto> baseMonitorunitInfoDtos = new ArrayList<>();
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(!ShiroUtils.getLoginName().equals("admin")){
       for (SysRole sysRole : sysRoles) {
@@ -184,7 +184,7 @@ public class WisdomScenarioContorller extends BaseController {
     List<BaseAlarmModuleDto> baseAlarmModuleDtos = new ArrayList();
     SysUser sysUser = ShiroUtils.getSysUser();
 
-    List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+    List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
     if(!ShiroUtils.getLoginName().equals("admin")){
       for (SysRole sysRole : sysRoles) {
@@ -248,7 +248,7 @@ public class WisdomScenarioContorller extends BaseController {
         List<RecordAlarmDto> recordAlarmDtos = new ArrayList<>();
         SysUser sysUser = ShiroUtils.getSysUser();
 
-        List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+        List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
         for (SysRole sysRole : sysRoles) {
           RecordAlarm recordAlarm = new RecordAlarm();
           recordAlarm.setRoleId(sysRole.getRoleId());
diff --git a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
index de2a422..e5d1fa3 100644
--- a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
+++ b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html
@@ -638,7 +638,7 @@
             html += '<p>' + x.paramTitle + '：<span>' + x.paramValue + '</span></p>';
           });
         }
-        html += '    <p>所属变电站：<span>' + res[0].substationName + '</span></p>';
+        /*html += '    <p>所属变电站：<span>' + res[0].substationName + '</span></p>';*/
         $("#sensor-text").append(html);
       },
       error: () => {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index d2fc3a7..eda7258 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -36,6 +36,13 @@ public interface ISysRoleService
      */
     public List<SysRole> selectRolesByUserId(Long userId);
 
+    /**
+     * 根据用户ID获取所具备的角色信息
+     * @param userId
+     * @return
+     */
+    public List<SysRole> GetRoleInfoByUserId(Long userId);
+
     /**
      * 查询所有角色
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorInfoServiceImpl.java
index 4ad04d3..b4f7b9f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseSensorInfoServiceImpl.java
@@ -61,7 +61,7 @@ public class BaseSensorInfoServiceImpl implements IBaseSensorInfoService
             List<BaseSensorInfoDto> list = new ArrayList<>();
             SysUser sysUser = ShiroUtils.getSysUser();
 
-            List<SysRole> sysRoles = iSysRoleService.selectRolesByUserId(sysUser.getUserId());
+            List<SysRole> sysRoles = iSysRoleService.GetRoleInfoByUserId(sysUser.getUserId());
 
             if(ShiroUtils.getLoginName().equals("admin")){
                 List<BaseSensorInfoDto> baseSensorInfoDtos = baseSensorInfoMapper.selectBaseSensorInfoList(baseSensorInfo);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 595acd1..c9c22b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -108,6 +108,21 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roles;
     }
 
+    /**
+     * 根据用户ID获取所具备的角色信息
+     * @param userId
+     * @return
+     */
+    public List<SysRole> GetRoleInfoByUserId(Long userId)
+    {
+        List<SysRole> userRoles = roleMapper.selectRolesByUserId(userId);
+        List<SysRole> roles = selectRoleAll();
+        if (userRoles.size() == 0){
+            return roles;
+        }
+        return userRoles;
+    }
+
     /**
      * 查询所有角色
      *