From 87f046221f42da6103124e6017e8297d7e20458f Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 21 Jan 2026 13:12:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A1=98=E5=8F=A3=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intc/fishery/controller/PondController.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java index c92eb20..8026a6f 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/controller/PondController.java @@ -442,14 +442,10 @@ public class PondController extends BaseController { @Transactional(rollbackFor = Exception.class) public R selectDeviceOrSwitch( @Validated @RequestBody PondSelectDeviceOrSwitchBo request) { - - // 获取当前登录用户ID - Long userId = LoginHelper.getUserId(); - // 查询塘口信息并验证权限 Pond pond = pondMapper.selectById(request.getPondId()); - if (pond == null || !pond.getUserId().equals(userId)) { - return R.fail("塘口不存在或无权限访问"); + if (pond == null) { + return R.fail("塘口不存在"); } // 处理空列表 @@ -898,19 +894,19 @@ public class PondController extends BaseController { .eq(LinkedCtrl::getDeviceId, request.getId()) .select(LinkedCtrl::getId) ); - + if (!linkedCtrls.isEmpty()) { List linkedCtrlIds = linkedCtrls.stream() .map(LinkedCtrl::getId) .collect(Collectors.toList()); - + // 2. 解除关联的开关绑定 deviceSwitchMapper.update(null, new LambdaUpdateWrapper() .set(DeviceSwitch::getLinkedCtrlId, null) .in(DeviceSwitch::getLinkedCtrlId, linkedCtrlIds) ); - + // 3. 删除联动控制记录 linkedCtrlMapper.delete( new LambdaQueryWrapper()