From df2f2b669f4196f599ca4db91917314ddc4ed94f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
index 452227f..92e0bf6 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java
@@ -246,9 +246,10 @@
//������������
for (VersionSensorUnit versionSensorUnit : deleteList) {
UpdateWrapper deleteOrganizationUnitAlarmWrapper = new UpdateWrapper();
- deleteOrganizationUnitAlarmWrapper.eq("orgniazation_id",organizationId);
+ deleteOrganizationUnitAlarmWrapper.eq("organization_id",organizationId);
deleteOrganizationUnitAlarmWrapper.eq("version_id",versionId);
deleteOrganizationUnitAlarmWrapper.eq("sensor_code",versionSensorUnit.getSensorCode());
+ deleteOrganizationUnitAlarmWrapper.set("is_delete",Constants.DELETE);
organizationUnitAlarmMapper.update(null,deleteOrganizationUnitAlarmWrapper);
}
//������������
--
Gitblit v1.8.0