From 0e8f5e7b14d4d654b5241a8eac8fa7f389a8bd45 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Wed, 6 May 2026 14:47:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(watch):=20=20=E5=AF=BC=E5=85=A5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BB=91=E5=AE=9A=E6=97=B6=EF=BC=8C=E6=89=8B=E8=A1=A8?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=8D=95=E4=BD=8D=E4=BB=A5=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=BA=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/renkang/watch/async/AsyncImportService.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java
index 9a45c05..a7205fd 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/async/AsyncImportService.java
@@ -336,8 +336,9 @@ public class AsyncImportService {
                 updatedWatchDevice.setBindDate(watchDevice.getBindDate()==null?new Date():watchDevice.getBindDate());
                 updatedWatchDevice.setUpdateDate(new Date());
                 updatedWatchDevice.setUpdateBy(sysUser.getId());
-                updatedWatchDevice.setDeptId(device.getDeptId());
-                updatedWatchDevice.setOrgCode(device.getOrgCode());
+                // 这里修改成以用户的部门为准，更新手表的所属部门
+                updatedWatchDevice.setDeptId(sysCache.getDepartIdByOrgCode(user.getOrgCode()));
+                updatedWatchDevice.setOrgCode(user.getOrgCode());
                 updateList.add(updatedWatchDevice);
             }
             info1.setHandleMsg(index + "/" + count);