From 2e90ec71cc2ca37bd08e3338cee285c435775218 Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Fri, 27 Mar 2026 15:48:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=89=8B=E8=A1=A8=E8=AE=BE=E5=A4=87):=20?=
 =?UTF-8?q?=E6=89=8B=E8=A1=A8=E7=BB=91=E5=AE=9A=E6=97=B6=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=BB=91=E5=AE=9A=E6=9C=AC=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增单位编码前6位匹配校验，禁止跨单位绑定手表；
同时将"该设备已绑定该员工"改为"该设备已被绑定"

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../service/impl/WatchDeviceServiceImpl.java      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 96f99c1..482681e 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
@@ -293,8 +293,18 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
         if (watchDevice == null) {
             return Result.error("该监测工具不存在");
         }
+
+        // 新增手表只能绑定给本单位的人
+        LoginUser userById = sysBaseAPI.getUserById(dto.getBindUserId());
+
+        if (userById.getOrgCode() == null || dto.getOrgCode() == null ||
+                userById.getOrgCode().length() < 6 || dto.getOrgCode().length() < 6 ||
+                !userById.getOrgCode().substring(0, 6).equals(dto.getOrgCode().substring(0, 6))) {
+            return Result.error("手表只能绑定给本单位人员");
+        }
+
         if (isDeviceAlreadyBound(watchDevice, dto)) {
-            return Result.error("该设备已绑定该员工");
+            return Result.error("该设备已被绑定");
         }
         // 查询员工是否有绑定
         List<WatchDevice> deviceByUserIdList = getDeviceByUserId(dto.getBindUserId());
@@ -322,9 +332,8 @@ public class WatchDeviceServiceImpl extends ServiceImpl<WatchDeviceMapper, Watch
             // 初始化开关数据
             unbindUserAndInitDeviceSwitch(dto);
         }
-        LoginUser userById = sysBaseAPI.getUserById(dto.getBindUserId());
         // 此处修改 只有是职工的是才赋值单位信息
-        if (dto.getIsEmployee()){
+        if (dto.getIsEmployee()) {
             SysDepart inDepart = sysCache.getDepartByOrgCode(userById.getOrgCode());
             dto.setOrgCode(inDepart.getOrgCode());
             SysDepart thirdDepart = sysCache.getDepartByOrgCode(GlobalUtils.getThirdDepartOrgCode(userById.getOrgCode()));