From 99f150be25ea2026ede4b715d1714564dce0dbb9 Mon Sep 17 00:00:00 2001
From: lianlonggang <lianlonggang@qq.com>
Date: Mon, 25 May 2026 14:08:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(watch):=20=E6=89=8B=E8=A1=A8=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AF=BC=E5=87=BA=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=92=8C=E7=94=A8=E6=88=B7=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/renkang/watch/vo/ToolExport.java        | 4 ++++
 .../renkang/watch/service/impl/WatchDeviceServiceImpl.java    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java
index 87dc6f3..a6fbb85 100644
--- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java
+++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/ToolExport.java
@@ -25,6 +25,10 @@ public class ToolExport {
     private String workNo;
     @Excel(name = "绑定用户")
     private String realName;
+    @Excel(name = "用户单位")
+    private String userOrgName;
+    @Excel(name = "用户部门")
+    private String userDeptName;
     @Excel(name = "绑定日期", format = "yyyy-MM-dd", width = 30)
     private Date bindDate;
     @Excel(name = "心率")
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
index 3627fb6..2930ef2 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDeviceServiceImpl.java
@@ -2214,6 +2214,8 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
                 tool.setBindStatus("1".equals(f.getWatchStatus()) ? "已绑定" : "未绑定");
                 tool.setWorkNo(f.getWorkNo());
                 tool.setRealName(f.getBindRealName());
+                tool.setUserOrgName(f.getUserTwoOrgName());
+                tool.setUserDeptName(f.getUserThreeOrgName());
                 tool.setBindDate(f.getBindDate());
                 if (StrUtil.isNotBlank(f.getBindRealName())) {
                     fillSwitch(tool, f.getSwitchList());