浏览代码

fix nfc 配件关闭问题

tanbin 6 天之前
父节点
当前提交
b36f170ace
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. 8 6
      device-api-service/src/main/java/com/xy/service/DevicePartServiceImpl.java

+ 8 - 6
device-api-service/src/main/java/com/xy/service/DevicePartServiceImpl.java

@@ -73,12 +73,6 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
                     .eq(DevicePart::getDeviceId, deviceId)
                     .eq(DevicePart::getCode, saveOrUpdate.getCode())
             );
-            //删除
-            if (saveOrUpdate.getIsRemove() && devicePart != null) {
-                removeById(devicePart.getId());
-                return;
-            }
-
             String code = saveOrUpdate.getCode();
             //nfc 系统信息表更新
             if (Emptys.check(code) && "zfbNfc".equals(code)) {
@@ -87,6 +81,14 @@ public class DevicePartServiceImpl extends ServiceImpl<DevicePartMapper, DeviceP
                 boolean haveNfc = BooleanUtil.isTrue(jsonObject.getBool("is"));
                 deviceSysinfoService.updateById(new DeviceSysinfo().setDeviceId(deviceId).setIsHaveAlipayNpad(haveNfc));
             }
+
+            //删除
+            if (saveOrUpdate.getIsRemove() && devicePart != null) {
+                removeById(devicePart.getId());
+                return;
+            }
+
+
             //新增
             if (devicePart == null) {
                 DevicePart info = copy(DevicePart.class, saveOrUpdate)