diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
index e623e9d6..95f91979 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java
@@ -5,8 +5,6 @@ import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
-import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
-import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
 import com.fuyuanshen.web.service.DeviceShareService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java
index 16ca6d3d..ed77bf2f 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceLogServiceImpl.java
@@ -53,6 +53,7 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
         return baseMapper.selectVoById(id);
     }
 
+
     /**
      * 分页查询设备日志列表
      *
@@ -62,13 +63,12 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
      */
     @Override
     public TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery) {
-
-
         LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo);
         Page<DeviceLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+
     /**
      * 查询符合条件的设备日志列表
      *
@@ -83,13 +83,17 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
 
     private LambdaQueryWrapper<DeviceLog> buildQueryWrapper(DeviceLogBo bo) {
 
-        Long userId = LoginHelper.getUserId();
-        List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId));
-        List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList());
-        if (deviceIds.isEmpty()) {
-            deviceIds.add(-1L);
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            Long userId = LoginHelper.getUserId();
+            List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId));
+            List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList());
+            if (deviceIds.isEmpty()) {
+                deviceIds.add(-1L);
+            }
+            bo.setDeviceIds(deviceIds);
         }
-        bo.setDeviceIds(deviceIds);
 
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DeviceLog> lqw = Wrappers.lambdaQuery();