diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index 0c0020a0b..9214ba13c 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -1,5 +1,6 @@
 package org.dromara.web.controller.app;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -147,6 +148,7 @@ public class EqDeviceController extends BaseController {
         if (zoneId.contains(" ")) zoneId = zoneId.replace(" ", "+");
         EqEquipmentLogBo eqEquipmentLogBo = new EqEquipmentLogBo();
         eqEquipmentLogBo.setEquipmentId(bo.getEquipmentId());
+        BeanUtil.copyProperties(bo, eqEquipmentLogBo);
         TableDataInfo<EqEquipmentLogVo> data = logService.queryPageList(eqEquipmentLogBo, pageQuery);
         List<EqEquipmentLogVo> rows = data.getRows();
         if (CollUtil.isEmpty(rows)) return new HashMap<>();
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java
index e8221598b..85115ba2e 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqHomeController.java
@@ -44,7 +44,6 @@ public class EqHomeController extends BaseController {
     private final IEqAreaService eqAreaService;
     private final IEqFamilyService eqFamilyService;
     private final IEqEquipmentService eqEquipmentService;
-
     private final IEqShareService shareService;
     private final ISysUserService userService;
     private final IEqUserConfigService eqUserConfigService;
@@ -249,9 +248,9 @@ public class EqHomeController extends BaseController {
         }
         bo.setSharedUserId(sysUserVo.getUserId());
         bo.setSharedUserName(sysUserVo.getUserName());
-        List<EqShareVo> eqShareVos = eqShareService.queryList(bo);
+        List<EqShareVo> eqShareVos = shareService.queryList(bo);
         if (!eqShareVos.isEmpty()) throw new RuntimeException("该成员已被分享");
-        return toAjax(eqShareService.insertByBo(bo));
+        return toAjax(shareService.insertByBo(bo));
     }
 
     /**
@@ -263,7 +262,7 @@ public class EqHomeController extends BaseController {
     @DeleteMapping("/deleteFamily/{sharedId}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String sharedId) {
-        return toAjax(eqShareService.deleteBySharedId(sharedId));
+        return toAjax(shareService.deleteBySharedId(sharedId));
     }
 
     /**
@@ -275,7 +274,7 @@ public class EqHomeController extends BaseController {
     @DeleteMapping("/deleteMember/{shareId}")
     public R<Void> removeShare(@NotEmpty(message = "主键不能为空")
                           @PathVariable String shareId) {
-        return toAjax(eqShareService.deleteByShareId(shareId));
+        return toAjax(shareService.deleteByShareId(shareId));
     }
 
     /**
@@ -379,7 +378,7 @@ public class EqHomeController extends BaseController {
     }
 
 
-    private final IEqShareService eqShareService;
+
 
 
 }