Merge branch '2024-03-28' into 'master_dev'

fix：编辑场景联动验证触发器设备是否属于当前选择组织的取值错误

See merge request yunteng/thingskit!378

@@ -74,7 +74,7 @@ public class TkSceneLinkageServiceImpl
       sceneLinkage.copyToDTO(sceneLinkageDTO);
       sceneLinkage.copyToDTO(sceneLinkageDTO);
     }
     }
 
 
-    updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage);
+    updateScene(sceneLinkageDTO, tenantId, customerId);
 
 
     return sceneLinkageDTO;
     return sceneLinkageDTO;
   }
   }
@@ -85,14 +85,12 @@ public class TkSceneLinkageServiceImpl
    * @param sceneLinkageDTO 场景联动表单数据
    * @param sceneLinkageDTO 场景联动表单数据
    * @param tenantId 租户ID
    * @param tenantId 租户ID
    * @param customerId 客户ID
    * @param customerId 客户ID
-   * @param sceneLinkage 场景联动主表实体
    */
    */
   private void updateScene(
   private void updateScene(
       SceneLinkageDTO sceneLinkageDTO,
       SceneLinkageDTO sceneLinkageDTO,
       String tenantId,
       String tenantId,
-      String customerId,
-      TkSceneLinkageEntity sceneLinkage) {
-    String organizationId = sceneLinkage.getOrganizationId();
+      String customerId) {
+    String organizationId = sceneLinkageDTO.getOrganizationId();
     List<DeviceDTO> organizationDevices =
     List<DeviceDTO> organizationDevices =
         findDeviceList(organizationId, tenantId, customerId, new ArrayList<>());
         findDeviceList(organizationId, tenantId, customerId, new ArrayList<>());
 
 
@@ -159,7 +157,7 @@ public class TkSceneLinkageServiceImpl
     if (!sceneLinkage.getCreator().equals(currentUserId)) {
     if (!sceneLinkage.getCreator().equals(currentUserId)) {
       throw new TkDataValidationException("你不是此场景的创建者");
       throw new TkDataValidationException("你不是此场景的创建者");
     }
     }
-    updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage);
+    updateScene(sceneLinkageDTO, tenantId, customerId);
 
 
     sceneLinkageDTO.copyToEntity(sceneLinkage);
     sceneLinkageDTO.copyToEntity(sceneLinkage);
     sceneLinkage.setTenantId(tenantId);
     sceneLinkage.setTenantId(tenantId);