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 5dbe6b596..c4d781181 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
@@ -223,9 +223,14 @@ public class EqDeviceController extends BaseController {
 
         //更新开合度状态到设备
         eqEquipmentBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
-        eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());
-        eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
-        eqEquipmentBo.setLineStatus(eqEquipmentBo.getLineStatus());
+//        eqEquipmentBo.setStatus(eqEquipmentLogBo.getOpenStatus());//该参数暂时无用
+        if (status == 500||status==501){
+            eqEquipmentBo.setLineStatus(status-500);
+        }
+        if (status>=10&&status<=14){
+            eqEquipmentBo.setFaultStatus(eqEquipmentBo.getFaultStatus());
+        }
+
         eqEquipmentService.updateByBo(eqEquipmentBo);
     }
 
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java
index 942dd575d..caa5707e5 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EqEquipmentLogServiceImpl.java
@@ -78,7 +78,7 @@ public class EqEquipmentLogServiceImpl implements IEqEquipmentLogService {
         lqw.eq(bo.getStatus() != null, EqEquipmentLog::getStatus, bo.getStatus());
         lqw.eq(bo.getFaultStatus() != null, EqEquipmentLog::getFaultStatus, bo.getFaultStatus());
         lqw.eq(bo.getLineStatus() != null, EqEquipmentLog::getLineStatus, bo.getLineStatus());
-        lqw.eq(bo.getCreatedYearDay() != null, EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreatedYearDay()), EqEquipmentLog::getCreatedYearDay, bo.getCreatedYearDay());
         lqw.eq(bo.getCreatedHourSecond() != null, EqEquipmentLog::getCreatedHourSecond, bo.getCreatedHourSecond());
         lqw.eq(bo.getDayOfWeek() != null, EqEquipmentLog::getDayOfWeek, bo.getDayOfWeek());
 //        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,