From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java
index ec204b6..0921430 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/DncDevicePermissionServiceImpl.java
@@ -1,9 +1,8 @@
package org.jeecg.modules.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.system.entity.DncDevicePermission;
-import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.DncDevicePermissionMapper;
import org.jeecg.modules.system.service.IDncDevicePermissionService;
@@ -22,6 +21,11 @@
@Override
public void addDevicePermission(String EquipmentId, String userId) {
DncDevicePermission dncDevicePermission=new DncDevicePermission(EquipmentId,userId);
+ List<DncDevicePermission> devicePermissionList=super.list(new LambdaQueryWrapper<DncDevicePermission>().eq(DncDevicePermission::getDeviceId,EquipmentId)
+ .eq(DncDevicePermission::getUserId,userId));
+ if (!devicePermissionList.isEmpty()){
+ return;
+ }
SysUser sysUser=sysUserService.getUserByName("admin");
if (userId.equals(sysUser.getId())) {
// 绠＄悊鍛樻柊澧�
--
Gitblit v1.9.3