From 475ca820c8c46b78cfb4adfcfaeb3a2c40cf933f Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 18 Mar 2026 17:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A7=98=E9=92=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/common/service/impl/TerminalBaseServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java index de42e5ebc..018adc601 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java @@ -885,11 +885,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple private void coderM3d(Device deviceDetail, Boolean updateFlag) { if (updateFlag) { Device deviceRes = deviceMapper.selectById(deviceDetail.getId()); - if (StrUtil.isNotBlank(deviceDetail.getDevKey()) && !deviceRes.getDevKey().equals(deviceDetail.getDevKey())) { + if (!Objects.equals(deviceRes.getDevKey(),deviceDetail.getDevKey())) { deviceDetail.setDevKey(DeviceUtil.encodeString(devCD, deviceDetail.getDevKey())); } - - if (StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())) { + if (!Objects.equals(deviceRes.getSeries(),deviceDetail.getSeries())) { deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries())); } } else { @@ -900,7 +899,6 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple deviceDetail.setSeries(DeviceUtil.encodeString(devCD, deviceDetail.getSeries())); } } - } private void decoderM3d(Device deviceDetail) {