From 14949a6a6e7dec654d13e75f46b24319a624ff8b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:13:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index b238e39..dfc648b 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -330,6 +330,7 @@
             QueryWrapper<DeviceAdjustValue> wrapper1 = new QueryWrapper<>();
             wrapper1.eq("mac",adjustForm.getMac());
             wrapper1.eq ("sensor_code",adjustForm.getCode());
+            wrapper1.eq("is_delete",0);
             Integer integer = deviceAdjustValueMapper.selectCount(wrapper1);
             if (integer==0){
                 deviceAdjustValue.setValue(adjustForm.getAgehou());

--
Gitblit v1.8.0