Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

Merge remote-tracking branch 'origin/dev' into dev_

 screen-manage/src/main/java/com/moral/api/service/impl/VersionServiceImpl.java

@@ -224,12 +224,14 @@
                deleteList.add(value);
        });
        //删除记录
        if (!ObjectUtils.isEmpty(deleteList)) {
        UpdateWrapper deleteWrapper = new UpdateWrapper();
        List<Integer> deleteIds = new ArrayList<>();
        deleteList.forEach(value->deleteIds.add(value.getId()));
        deleteWrapper.in("id",deleteIds);
        deleteWrapper.set("is_delete", Constants.DELETE);
        versionSensorUnitMapper.update(null, deleteWrapper);
        }
        //添加记录
        for (VersionSensorUnit sensorUnit : insertList) {
            versionSensorUnitMapper.insert(sensorUnit);