Merge branch '20220310' into 'master'

20220310

See merge request huang/thingsboard3.3.2!62

@@ -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);
     }
     }
 
 
     /**
     /**

@@ -73,20 +73,7 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     batchInsert(userId, organizationIds);
     batchInsert(userId, organizationIds);
   }
   }
 
 
-  @Override
-  public List<String> getUserIdsByOrganizationId(String organizationId) {
-    if (StringUtils.isAllEmpty(organizationId)) {
-      throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
-    }
-    return userOrganizationMappingMapper
-        .selectList(
-            new QueryWrapper<UserOrganizationMapping>()
-                .lambda()
-                .eq(UserOrganizationMapping::getOrganizationId, organizationId))
-        .stream()
-        .map(UserOrganizationMapping::getUserId)
-        .collect(Collectors.toList());
-  }
+
 
 
   @Override
   @Override
   public List<String> getOrganizationIdsByUserId(String userId) {
   public List<String> getOrganizationIdsByUserId(String userId) {

@@ -521,7 +521,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (group == null || !group.getTenantId().equals(tenantId)) {
     if (group == null || !group.getTenantId().equals(tenantId)) {
       return Optional.empty();
       return Optional.empty();
     }
     }
-    List<String> userIds = userOrganizationMappingService.getUserIdsByOrganizationId(group.getId());
+    List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId());
     List<User> users = baseMapper.selectBatchIds(userIds);
     List<User> users = baseMapper.selectBatchIds(userIds);
     return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class));
     return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class));
   }
   }
@@ -590,7 +590,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     }
     if (isTenantAdmin) {
     if (isTenantAdmin) {
       List<String> userList =
       List<String> userList =
-          userOrganizationMappingService.getUserIdsByOrganizationId(organizationId);
+          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,organizationId);
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
       }
       }

@@ -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);
 
 
     /**
     /**
      * 修改场景联动
      * 修改场景联动

@@ -22,13 +22,7 @@ public interface UserOrganizationMappingService {
   void addOrUpdateUserOrganizationMapping(
   void addOrUpdateUserOrganizationMapping(
       String userId, List<String> organizationIds, boolean isUpdate);
       String userId, List<String> organizationIds, boolean isUpdate);
 
 
-  /**
-   * 根据组织ID查询其用户ID列表
-   *
-   * @param organizationId 组织ID
-   * @return 用户ID集合
-   */
-  List<String> getUserIdsByOrganizationId(String organizationId);
+
 
 
   /**
   /**
    * 根据用户ID查询其所拥有的组织ID列表
    * 根据用户ID查询其所拥有的组织ID列表