fix: 场景联动只有创建者可以删除

@@ -97,7 +97,7 @@ public class YtSceneLinkageController extends BaseController {
   public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
   public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
       throws ThingsboardException {
     sceneLinkageService.deleteSceneLinkage(
     sceneLinkageService.deleteSceneLinkage(
-        deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());
+        deleteDTO.getIds(), getCurrentUser().getCurrentTenantId(),getCurrentUser().getCurrentUserId());
   }
   }
 
 
 
 

@@ -91,7 +91,18 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
      * @param ids 删除的ids
      * @param ids 删除的ids
      */
      */
     @Override
     @Override
-    public void deleteSceneLinkage(Set<String> ids, String tenantId) {
+    @Transactional
+    public void deleteSceneLinkage(Set<String> ids, String tenantId,String currentUserId) {
+        LambdaQueryWrapper<SceneLinkage> Wrapper =
+                new QueryWrapper<SceneLinkage>()
+                        .lambda()
+                        .eq(SceneLinkage::getTenantId, tenantId)
+                        .eq(SceneLinkage::getCreator,currentUserId)
+                        .in(SceneLinkage::getId, ids);
+        int result = sceneLinkageMapper.delete(Wrapper);
+        if(result != ids.size()){
+            throw new YtDataValidationException("存在非当前用户创建的场景联动");
+        }
         // 删除场景,一并删除数据库触发器,执行条件,执行动作的数据
         // 删除场景,一并删除数据库触发器,执行条件,执行动作的数据
         triggerMapper.delete(
         triggerMapper.delete(
                 new LambdaQueryWrapper<Trigger>()
                 new LambdaQueryWrapper<Trigger>()
@@ -105,12 +116,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                 new LambdaQueryWrapper<DoAction>()
                 new LambdaQueryWrapper<DoAction>()
                         .eq(DoAction::getTenantId, tenantId)
                         .eq(DoAction::getTenantId, tenantId)
                         .in(DoAction::getSceneLinkageId, ids));
                         .in(DoAction::getSceneLinkageId, ids));
-        LambdaQueryWrapper<SceneLinkage> Wrapper =
-                new QueryWrapper<SceneLinkage>()
-                        .lambda()
-                        .eq(SceneLinkage::getTenantId, tenantId)
-                        .in(SceneLinkage::getId, ids);
-        sceneLinkageMapper.delete(Wrapper);
     }
     }
 
 
     /**
     /**

@@ -31,7 +31,7 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
      * @param ids
      * @param ids
      * @return
      * @return
      */
      */
-   void deleteSceneLinkage(Set<String> ids,String tenantId);
+   void deleteSceneLinkage(Set<String> ids,String tenantId,String currentUserId);
 
 
     /**
     /**
      * 修改场景联动
      * 修改场景联动