From 67e736eaefd59d98f1f3bfdf593e7fdd3d75d52d Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 18 Oct 2025 11:40:51 +0800
Subject: [PATCH] 细化授权文件不存在和不匹配

---
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index b6f48d4..cd29c0f 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -679,9 +679,9 @@
     public Boolean updateWorkType(String sn, Long workType) {
         // 方式1:使用LambdaUpdateWrapper(推荐,类型安全,避免字段名硬编码)
         LambdaUpdateWrapper<DeviceEntity> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        // 设置更新条件:deviceSn = 100
+        // 设置更新条件:deviceSn = sn
         lambdaUpdateWrapper.eq(DeviceEntity::getDeviceSn, sn)
-                // 只更新status字段为"online"
+                // 只更新workType字段
                 .set(DeviceEntity::getWorkType, workType);
         // 执行更新(第一个参数传null,因为更新字段已通过wrapper的set指定)
         int update = mapper.update(null, lambdaUpdateWrapper);
@@ -818,11 +818,12 @@
      */
     @Override
     public PaginationData<DeviceDTO> getBoundDevicesWithDomain(Long page,
-                                                               Long pageSize, Integer domain) {
+                                                               Long pageSize, Integer domain, Long deptId) {
 
         Page<DeviceEntity> pagination = mapper.selectPage(new Page<>(page, pageSize),
                 new LambdaQueryWrapper<DeviceEntity>()
                         .eq(DeviceEntity::getDomain, domain)
+                        .eq(deptId != null, DeviceEntity::getDeptId, deptId)
                         .isNotNull(DeviceEntity::getDeptId));
 //                        .eq(DeviceEntity::getBoundStatus, true));
         List<DeviceDTO> devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO)

--
Gitblit v1.9.3