From 9b2b099e2ee76934282af3f89843339e28896f2e Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 18 Sep 2025 16:14:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9orgcode=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=80=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nu/mq/device/listener/IotSyncBizMQListener.java     | 3 +++
 .../nubaseinfo/service/impl/NuBaseInfoServiceImpl.java      | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java
index b7ecd51..f24435d 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java
@@ -85,11 +85,14 @@ public class IotSyncBizMQListener {
                     entity.setDelFlag(iotNuBaseInfoMQDto.getDelFlag());
                     NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity();
                     BeanUtils.copyProperties(entity, nuBaseInfo);
+                    nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode());
                     nuBaseInfoApi.updateById(nuBaseInfo);
                 }
             }else{
                 NuBaseInfoEntity nuBaseInfo = new NuBaseInfoEntity();
                 BeanUtils.copyProperties(iotNuBaseInfoMQDto, nuBaseInfo);
+                nuBaseInfo.setSysOrgCode(iotNuBaseInfoMQDto.getOrgCode());
+                nuBaseInfo.setStatus("0");
                 nuBaseInfoApi.save(nuBaseInfo);
             }
             statusList.add(statusMQDto);
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java
index 90c62b1..1817b0a 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java
@@ -108,7 +108,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
     public void save(NuBaseInfoEntity dto) {
         NuBaseInfo nuBaseInfo = new NuBaseInfo();
         BeanUtils.copyProperties(dto, nuBaseInfo);
-        setNuId(nuBaseInfo);
+//        setNuId(nuBaseInfo);
         nuBaseInfo.setSysOrgCode(dto.getOrgCode());
         baseMapper.insert(nuBaseInfo);
     }
@@ -224,7 +224,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
         QueryWrapper<NuBaseInfo> qw = new QueryWrapper<>();
         qw.eq("nu_id",nuId);
         NuBaseInfo nuBaseInfo = baseMapper.selectOne(qw);
-
+        if(nuBaseInfo == null){
+            return null;
+        }
         NuBaseInfoEntity result = new NuBaseInfoEntity();
         BeanUtils.copyProperties(nuBaseInfo,result);
         return result;