fix: fix some bug【DEFECT-745 、DEFECT-744、DEFECT-743、DEFECT-742】 on teambition

@@ -62,12 +62,14 @@ public class YtConfigurationCenterController extends BaseController {
     if (null != orderType) {
     if (null != orderType) {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }
-    return ytConfigurationCenterService.page(queryMap);
+    queryMap.put("userId",getCurrentUser().getCurrentUserId());
+    return ytConfigurationCenterService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
   }
 
 
   @PostMapping
   @PostMapping
   @ApiOperation("新增")
   @ApiOperation("新增")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:post'})")
   public ResponseEntity<ConfigurationCenterDTO> save(
   public ResponseEntity<ConfigurationCenterDTO> save(
       @Validated({AddGroup.class}) @RequestBody ConfigurationCenterDTO configurationCenterDTO)
       @Validated({AddGroup.class}) @RequestBody ConfigurationCenterDTO configurationCenterDTO)
       throws ThingsboardException {
       throws ThingsboardException {
@@ -78,7 +80,8 @@ public class YtConfigurationCenterController extends BaseController {
 
 
   @PutMapping
   @PutMapping
   @ApiOperation("修改")
   @ApiOperation("修改")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:update'})")
   public ResponseEntity<ConfigurationCenterDTO> update(
   public ResponseEntity<ConfigurationCenterDTO> update(
       @Validated({UpdateGroup.class}) @RequestBody ConfigurationCenterDTO configurationCenterDTO)
       @Validated({UpdateGroup.class}) @RequestBody ConfigurationCenterDTO configurationCenterDTO)
       throws ThingsboardException {
       throws ThingsboardException {
@@ -89,7 +92,8 @@ public class YtConfigurationCenterController extends BaseController {
 
 
   @DeleteMapping
   @DeleteMapping
   @ApiOperation("删除")
   @ApiOperation("删除")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:delete'})")
   public ResponseEntity<Boolean> delete(
   public ResponseEntity<Boolean> delete(
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
       throws ThingsboardException {
@@ -99,7 +103,8 @@ public class YtConfigurationCenterController extends BaseController {
 
 
   @GetMapping("/get_configuration_info/{id}")
   @GetMapping("/get_configuration_info/{id}")
   @ApiOperation("获取组态信息")
   @ApiOperation("获取组态信息")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:get_configuration_info:get'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:configuration:center:get_configuration_info:get'})")
   public ResponseEntity<ConfigurationContentInfoDTO> getConfigurationInfos(
   public ResponseEntity<ConfigurationContentInfoDTO> getConfigurationInfos(
       @PathVariable("id") String id) throws ThingsboardException {
       @PathVariable("id") String id) throws ThingsboardException {
     return ResponseEntity.ok(
     return ResponseEntity.ok(

@@ -43,7 +43,9 @@ public class YtDataBoardController extends BaseController {
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
       @RequestParam(PAGE) int page,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
+      @RequestParam(value = "name", required = false) String name)
       throws ThingsboardException {
       throws ThingsboardException {
     Map<String, Object> queryMap = new HashMap<>();
     Map<String, Object> queryMap = new HashMap<>();
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE_SIZE, pageSize);
@@ -51,7 +53,14 @@ public class YtDataBoardController extends BaseController {
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put(ORDER_TYPE, orderType);
     queryMap.put(ORDER_TYPE, orderType);
     queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
     queryMap.put(TENANT_ID, getCurrentUser().getCurrentTenantId());
-    return ytDataBoardService.dataBoardPage(queryMap);
+    if (StringUtils.isNotBlank(organizationId)) {
+      queryMap.put("organizationId", organizationId);
+    }
+    if (StringUtils.isNotBlank(name)) {
+      queryMap.put("name", name);
+    }
+    queryMap.put("userId",getCurrentUser().getCurrentUserId());
+    return ytDataBoardService.dataBoardPage(queryMap, getCurrentUser().isTenantAdmin());
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping

@@ -63,6 +63,7 @@ public class YtReportFormConfigController extends BaseController {
     if (orderType != null) {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }
+    queryMap.put("userId",getCurrentUser().getCurrentUserId());
     if (null != startTime && null != endTime) {
     if (null != startTime && null != endTime) {
       if (startTime > endTime) {
       if (startTime > endTime) {
         throw new YtDataValidationException(
         throw new YtDataValidationException(
@@ -71,7 +72,7 @@ public class YtReportFormConfigController extends BaseController {
       queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
       queryMap.put("startTime", new Timestamp(startTime).toLocalDateTime());
       queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
       queryMap.put("endTime", new Timestamp(endTime).toLocalDateTime());
     }
     }
-    return reportFormConfigService.page(queryMap);
+    return reportFormConfigService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
   }
 
 
   @PostMapping
   @PostMapping

@@ -75,12 +75,14 @@ public class YtReportGenerateRecordController extends BaseController {
     if (orderType != null) {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
       queryMap.put(ORDER_TYPE, orderType.name());
     }
     }
-    return reportFormGenerateRecordService.page(queryMap);
+    queryMap.put("userId", getCurrentUser().getCurrentUserId());
+    return reportFormGenerateRecordService.page(queryMap, getCurrentUser().isTenantAdmin());
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
   @ApiOperation("删除")
   @ApiOperation("删除")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report:generate:record:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:report:generate:record:delete'})")
   public ResponseResult<Boolean> deleteReportGenerateRecord(
   public ResponseResult<Boolean> deleteReportGenerateRecord(
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
       @Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) {
     return reportFormGenerateRecordService.deleteReportGenerateRecord(deleteDTO)
     return reportFormGenerateRecordService.deleteReportGenerateRecord(deleteDTO)

@@ -28,46 +28,51 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
 public class YtVideoPlatformController extends BaseController {
 public class YtVideoPlatformController extends BaseController {
 
 
-    private final YtVideoPlatformService videoPlatformService;
+  private final YtVideoPlatformService videoPlatformService;
 
 
-    @GetMapping(params = {PAGE_SIZE, PAGE})
-    @ApiOperation("分页")
-    public YtPageData<YtVideoPlatformDTO> pageVideoPlatform(
-            @RequestParam(PAGE_SIZE) int pageSize,
-            @RequestParam(PAGE) int page,
-            @RequestParam(value = "host", required = false) String host,
-            @RequestParam(value = ORDER_FILED, required = false) String orderBy,
-            @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
-            throws ThingsboardException {
+  @GetMapping(params = {PAGE_SIZE, PAGE})
+  @ApiOperation("分页")
+  public YtPageData<YtVideoPlatformDTO> pageVideoPlatform(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = "host", required = false) String host,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
+      throws ThingsboardException {
 
 
+    IPage<YtVideoPlatformEntity> pageInfo =
+        videoPlatformService.getPage(page, pageSize, orderBy, orderType);
+    return videoPlatformService.page(
+        pageInfo,
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId(),
+        host);
+  }
 
 
-        IPage<YtVideoPlatformEntity> pageInfo = videoPlatformService.getPage(page, pageSize, orderBy, orderType);
-        return videoPlatformService.page(pageInfo, getCurrentUser().isPtTenantAdmin(),
-                getCurrentUser().getCurrentTenantId(),
-                getCurrentUser().getCurrentUserId(), host);
-    }
+  @PostMapping
+  @ApiOperation("新增|编辑")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:platform:post','api:yt:video:platform:update'})")
+  public YtVideoPlatformDTO saveOrUpdateVideoPlatform(
+      @Validated @RequestBody YtVideoPlatformDTO dto) throws ThingsboardException {
+    dto.setTenantId(getCurrentUser().getCurrentTenantId());
+    return videoPlatformService.saveOrUpdate(dto);
+  }
 
 
-    @PostMapping
-    @ApiOperation("新增|编辑")
-    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:platform:post','api:yt:video:platform:update'})")
-    public YtVideoPlatformDTO saveOrUpdateVideoPlatform(
-            @Validated @RequestBody YtVideoPlatformDTO dto) throws ThingsboardException {
-        dto.setTenantId(getCurrentUser().getCurrentTenantId());
-        return videoPlatformService.saveOrUpdate(dto);
-    }
+  @DeleteMapping
+  @ApiOperation("删除")
+  @PreAuthorize(
+      "@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:platform:delete'})")
+  public boolean deleteVideoPlatform(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    return videoPlatformService.deleteDataByIds(deleteDTO);
+  }
 
 
-    @DeleteMapping
-    @ApiOperation("删除")
-    @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{'api:yt:video:platform:delete'})")
-    public boolean deleteVideoPlatform(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
-            throws ThingsboardException {
-        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return videoPlatformService.deleteDataByIds(deleteDTO);
-    }
-    @GetMapping
-    @ApiOperation("获取当前用户的流媒体配置列表")
-    public List<YtVideoPlatformDTO> getVideoPlatformsByUser() throws ThingsboardException {
-        return videoPlatformService.getVideoPlatformsByUser(getCurrentUser().isTenantAdmin(),
-                getCurrentUser().getCurrentTenantId(), getCurrentUser().getCurrentUserId());
-    }
+  @GetMapping
+  @ApiOperation("获取当前用户的流媒体配置列表")
+  public List<YtVideoPlatformDTO> getVideoPlatformsByUser() throws ThingsboardException {
+    return videoPlatformService.getVideoPlatformsByUser(getCurrentUser().getCurrentTenantId());
+  }
 }
 }

@@ -17,6 +17,10 @@ public class DataBoardDTO extends TenantDTO {
   @NotEmpty(message = "数据看板名称不能为空或者空字符串",groups = AddGroup.class)
   @NotEmpty(message = "数据看板名称不能为空或者空字符串",groups = AddGroup.class)
   private String name;
   private String name;
 
 
+  @ApiModelProperty(value = "组织ID", required = true)
+  @NotEmpty(message = "组织ID不能为空或者空字符串",groups = AddGroup.class)
+  private String organizationId;
+
   @ApiModelProperty(value = "视图类型")
   @ApiModelProperty(value = "视图类型")
   private ViewType viewType = ViewType.PRIVATE_VIEW;
   private ViewType viewType = ViewType.PRIVATE_VIEW;
 
 

@@ -19,6 +19,9 @@ public class ReportGenerateRecordDTO extends TenantDTO {
   @ApiModelProperty(value = "组织名称")
   @ApiModelProperty(value = "组织名称")
   private String organizationName;
   private String organizationName;
 
 
+  @ApiModelProperty(value = "组织ID")
+  private String organizationId;
+
   @ApiModelProperty(value = "数据对比：0历史数据 1环比 2同比")
   @ApiModelProperty(value = "数据对比：0历史数据 1环比 2同比")
   private Integer dataCompare;
   private Integer dataCompare;
 
 

@@ -28,4 +28,6 @@ public class DataBoard extends TenantBaseEntity {
   private String remark;
   private String remark;
 
 
   private Integer componentNum;
   private Integer componentNum;
+
+  private String organizationId;
 }
 }

@@ -20,6 +20,9 @@ public class ReportGenerateRecord extends TenantBaseEntity {
   /** 组织名称 */
   /** 组织名称 */
   private String organizationName;
   private String organizationName;
 
 
+  /** 组织ID */
+  private String organizationId;
+
   /** 数据对比：0历史数据 1环比 2同比 */
   /** 数据对比：0历史数据 1环比 2同比 */
   private Integer dataCompare;
   private Integer dataCompare;
 
 

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -44,7 +42,7 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
         organizationMapper.findOrganizationTreeList(tenantId, List.of(ids)).stream()
         organizationMapper.findOrganizationTreeList(tenantId, List.of(ids)).stream()
             .map(OrganizationDTO::getId)
             .map(OrganizationDTO::getId)
             .collect(Collectors.toList());
             .collect(Collectors.toList());
-    if (null == collect || collect.size()==0) {
+    if (null == collect || collect.size() == 0) {
       return new ArrayList<>();
       return new ArrayList<>();
     } else {
     } else {
       Set<String> clearList = new HashSet<>();
       Set<String> clearList = new HashSet<>();
@@ -76,8 +74,6 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     batchInsert(userId, organizationIds);
     batchInsert(userId, organizationIds);
   }
   }
 
 
-
-
   @Override
   @Override
   public List<String> getOrganizationIdsByUserId(String userId) {
   public List<String> getOrganizationIdsByUserId(String userId) {
     if (StringUtils.isEmpty(userId)) {
     if (StringUtils.isEmpty(userId)) {
@@ -104,15 +100,18 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
   }
   }
 
 
   @Override
   @Override
-  public List<String> getEnableOrganizationIds(boolean isPtTenantAdmin, String tenantId, String userId, String organizationId) {
+  public List<String> getEnableOrganizationIds(
+      boolean isPtTenantAdmin, String tenantId, String userId, String organizationId) {
     List<String> organizationIds = null;
     List<String> organizationIds = null;
     if (StringUtils.isNotEmpty(organizationId)) {
     if (StringUtils.isNotEmpty(organizationId)) {
-      List<OrganizationDTO> organizationList =  organizationMapper.findOrganizationTreeList(tenantId, new HashSet<>(List.of(organizationId)));
-      if(organizationList.size()== FastIotConstants.MagicNumber.ZERO){
+      List<OrganizationDTO> organizationList =
+          organizationMapper.findOrganizationTreeList(
+              tenantId, new HashSet<>(List.of(organizationId)));
+      if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }
       }
-      organizationIds = organizationList.stream()
-              .map(BaseDTO::getId).distinct().collect(Collectors.toList());
+      organizationIds =
+          organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
     } else {
     } else {
       if (!isPtTenantAdmin) {
       if (!isPtTenantAdmin) {
         organizationIds = getOrganizationIdsByUserId(userId);
         organizationIds = getOrganizationIdsByUserId(userId);
@@ -120,4 +119,23 @@ public class UserOrganizationMappingServiceImpl implements UserOrganizationMappi
     }
     }
     return organizationIds;
     return organizationIds;
   }
   }
+
+  @Override
+  public List<String> compareOrganizationIdsByCustomerId(
+      List<String> organizationIds, String userId) {
+    int zero = FastIotConstants.MagicNumber.ZERO;
+    List<String> list = getOrganizationIdsByUserId(userId);
+    if (organizationIds != null && organizationIds.size() > zero && list.size() > zero) {
+      List<String> result = new ArrayList<>();
+      for (String id : organizationIds) {
+        if (list.contains(id)) {
+          result.add(id);
+        }
+      }
+      if (result.size() > zero) {
+        return result;
+      }
+    }
+    return list;
+  }
 }
 }

@@ -16,9 +16,9 @@ import org.thingsboard.server.dao.yunteng.entities.ConfigurationCenter;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ConfigurationCenterMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationCenterService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
 import org.thingsboard.server.dao.yunteng.service.YtConfigurationContentService;
-
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -32,9 +32,12 @@ public class YtConfigurationCenterServiceImpl
     implements YtConfigurationCenterService {
     implements YtConfigurationCenterService {
   private final OrganizationMapper organizationMapper;
   private final OrganizationMapper organizationMapper;
   private final YtConfigurationContentService ytConfigurationContentService;
   private final YtConfigurationContentService ytConfigurationContentService;
+  private final UserOrganizationMappingService userOrganizationMappingService;
 
 
   @Override
   @Override
-  public YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap) {
+  public YtPageData<ConfigurationCenterDTO> page(
+      Map<String, Object> queryMap, boolean tenantAdmin) {
+    List<String> organizationIds = null;
     if (null != queryMap.get("organizationId")) {
     if (null != queryMap.get("organizationId")) {
       String organizationId = (String) queryMap.get("organizationId");
       String organizationId = (String) queryMap.get("organizationId");
       List<OrganizationDTO> organizationList =
       List<OrganizationDTO> organizationList =
@@ -43,11 +46,16 @@ public class YtConfigurationCenterServiceImpl
       if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
       if (organizationList.size() == FastIotConstants.MagicNumber.ZERO) {
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
         throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       }
       }
-      List<String> organizationIds =
+      organizationIds =
           organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
           organizationList.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
-      if (organizationIds.size() > FastIotConstants.MagicNumber.ZERO) {
-        queryMap.put("organizationIds", organizationIds);
-      }
+    }
+    if (!tenantAdmin && null != queryMap.get("userId")) {
+      // 获取客户的组织关系
+      String userId = (String) queryMap.get("userId");
+      organizationIds = userOrganizationMappingService.compareOrganizationIdsByCustomerId(organizationIds,userId);
+    }
+    if (null != organizationIds && organizationIds.size() > FastIotConstants.MagicNumber.ZERO) {
+      queryMap.put("organizationIds", organizationIds);
     }
     }
     IPage<ConfigurationCenter> page =
     IPage<ConfigurationCenter> page =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
@@ -59,14 +67,16 @@ public class YtConfigurationCenterServiceImpl
   @Override
   @Override
   @Transactional
   @Transactional
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
   public ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO) {
-    ConfigurationCenter configurationCenter = configurationCenterDTO.getEntity(ConfigurationCenter.class);
+    ConfigurationCenter configurationCenter =
+        configurationCenterDTO.getEntity(ConfigurationCenter.class);
     baseMapper.insert(configurationCenter);
     baseMapper.insert(configurationCenter);
     ConfigurationContentDTO contentDTO = new ConfigurationContentDTO();
     ConfigurationContentDTO contentDTO = new ConfigurationContentDTO();
     contentDTO.setTenantId(configurationCenter.getTenantId());
     contentDTO.setTenantId(configurationCenter.getTenantId());
     contentDTO.setType(FastIotConstants.PC_TYPE);
     contentDTO.setType(FastIotConstants.PC_TYPE);
     contentDTO.setName(FastIotConstants.FIRST_PAGE_NAME);
     contentDTO.setName(FastIotConstants.FIRST_PAGE_NAME);
     contentDTO.setConfigurationId(configurationCenter.getId());
     contentDTO.setConfigurationId(configurationCenter.getId());
-    contentDTO.setContent("<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
+    contentDTO.setContent(
+        "<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
     ytConfigurationContentService.saveConfigurationContent(contentDTO);
     ytConfigurationContentService.saveConfigurationContent(contentDTO);
     return configurationCenterDTO;
     return configurationCenterDTO;
   }
   }

@@ -3,43 +3,78 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
+import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.DataBoard;
 import org.thingsboard.server.dao.yunteng.entities.DataBoard;
 import org.thingsboard.server.dao.yunteng.mapper.DataBoardMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DataBoardMapper;
+import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
+@RequiredArgsConstructor
 public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper, DataBoard>
 public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper, DataBoard>
     implements YtDataBoardService {
     implements YtDataBoardService {
+  private final OrganizationMapper organizationMapper;
+  private final UserOrganizationMappingService userOrganizationMappingService;
+
   @Override
   @Override
-  public YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap) {
+  public YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
+    int zero = FastIotConstants.MagicNumber.ZERO;
+    String name = null != queryMap.get("name") ? queryMap.get("name").toString() : null;
     String tenantId =
     String tenantId =
         Optional.ofNullable(queryMap.get("tenantId"))
         Optional.ofNullable(queryMap.get("tenantId"))
-            .map(obj -> queryMap.get("tenantId").toString())
+            .map(Object::toString)
             .orElseThrow(
             .orElseThrow(
                 () -> {
                 () -> {
                   throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
                   throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
                 });
                 });
+    String organizationId =
+        null != queryMap.get("organizationId") ? queryMap.get("organizationId").toString() : null;
+    List<String> organizationIds = null;
+    if (null != organizationId) {
+      List<OrganizationDTO> list =
+          organizationMapper.findOrganizationTreeList(
+              (String) queryMap.get("tenantId"), new HashSet<>(List.of(organizationId)));
+      if (list.size() == zero) {
+        throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      }
+      organizationIds = list.stream().map(BaseDTO::getId).distinct().collect(Collectors.toList());
+    }
+
+    if (!tenantAdmin && null != queryMap.get("userId")) {
+      // 获取客户的组织关系
+      String userId = (String) queryMap.get("userId");
+      organizationIds =
+          userOrganizationMappingService.compareOrganizationIdsByCustomerId(
+              organizationIds, userId);
+    }
     IPage<DataBoard> page =
     IPage<DataBoard> page =
         baseMapper.selectPage(
         baseMapper.selectPage(
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
             getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false),
-            new LambdaQueryWrapper<DataBoard>().eq(DataBoard::getTenantId, tenantId));
+            new LambdaQueryWrapper<DataBoard>()
+                .eq(DataBoard::getTenantId, tenantId)
+                .like(StringUtils.isNotEmpty(name), DataBoard::getName, name)
+                .in(
+                    null != organizationIds && organizationIds.size() > zero,
+                    DataBoard::getOrganizationId,
+                    organizationIds));
     return getPageData(page, DataBoardDTO.class);
     return getPageData(page, DataBoardDTO.class);
   }
   }
 
 
@@ -127,5 +162,5 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   @Override
   @Override
   public boolean updateDataBoardComponentNum(String id, String tenantId, int count) {
   public boolean updateDataBoardComponentNum(String id, String tenantId, int count) {
     return baseMapper.updateDataBoardComponentNum(id, tenantId, count);
     return baseMapper.updateDataBoardComponentNum(id, tenantId, count);
- }
+  }
 }
 }

@@ -22,10 +22,8 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 import org.thingsboard.server.dao.yunteng.entities.ReportFormConfig;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportFormConfigMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportFormConfigMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtReportFormConfigService;
-import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
-import org.thingsboard.server.dao.yunteng.service.YtSysJobService;
+import org.thingsboard.server.dao.yunteng.service.*;
+
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -38,9 +36,9 @@ public class YtReportFromConfigServiceImpl
   private final OrganizationMapper organizationMapper;
   private final OrganizationMapper organizationMapper;
   private final YtSysJobService ytSysJobService;
   private final YtSysJobService ytSysJobService;
   private final YtReportGenerateRecordService ytReportGenerateRecordService;
   private final YtReportGenerateRecordService ytReportGenerateRecordService;
-
+  private final UserOrganizationMappingService userOrganizationMappingService;
   @Override
   @Override
-  public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap) {
+  public YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap,boolean tenantAdmin) {
     String tenantId =
     String tenantId =
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
         Optional.ofNullable(queryMap.get("tenantId")).map(Object::toString).orElse(null);
     List<String> organizationIds =
     List<String> organizationIds =
@@ -58,6 +56,10 @@ public class YtReportFromConfigServiceImpl
                   return null;
                   return null;
                 })
                 })
             .orElse(null);
             .orElse(null);
+    if(!tenantAdmin &&  null != queryMap.get("userId")){
+      String userId = queryMap.get("userId").toString();
+      organizationIds = userOrganizationMappingService.compareOrganizationIdsByCustomerId(organizationIds,userId);
+    }
     queryMap.put("organizationIds", organizationIds);
     queryMap.put("organizationIds", organizationIds);
     IPage<ReportFormConfigDTO> page =
     IPage<ReportFormConfigDTO> page =
         baseMapper.getReportFormConfigPage(
         baseMapper.getReportFormConfigPage(

@@ -37,6 +37,7 @@ import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.yunteng.entities.ReportGenerateRecord;
 import org.thingsboard.server.dao.yunteng.entities.ReportGenerateRecord;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
 import org.thingsboard.server.dao.yunteng.mapper.ReportGenerateRecordMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.YtOrganizationService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 import org.thingsboard.server.dao.yunteng.service.YtReportGenerateRecordService;
 
 
@@ -62,9 +63,11 @@ public class YtReportGenerateRecordServiceImpl
   private final YtOrganizationService ytOrganizationService;
   private final YtOrganizationService ytOrganizationService;
   private final TimeseriesService tsService;
   private final TimeseriesService tsService;
   private final FileStorageService fileStorageService;
   private final FileStorageService fileStorageService;
+  private final UserOrganizationMappingService userOrganizationMappingService;
 
 
   @Override
   @Override
-  public YtPageData<ReportGenerateRecordDTO> page(Map<String, Object> queryMap) {
+  public YtPageData<ReportGenerateRecordDTO> page(
+      Map<String, Object> queryMap, boolean tenantAdmin) {
     String reportConfigName =
     String reportConfigName =
         Optional.ofNullable(queryMap.get("reportConfigName")).map(Object::toString).orElse(null);
         Optional.ofNullable(queryMap.get("reportConfigName")).map(Object::toString).orElse(null);
     LocalDateTime startTime =
     LocalDateTime startTime =
@@ -75,6 +78,12 @@ public class YtReportGenerateRecordServiceImpl
         Optional.ofNullable(queryMap.get("executeStatus"))
         Optional.ofNullable(queryMap.get("executeStatus"))
             .map(obj -> Integer.valueOf(obj.toString()))
             .map(obj -> Integer.valueOf(obj.toString()))
             .orElse(null);
             .orElse(null);
+    List<String> organizationIds = null;
+    if (!tenantAdmin && null != queryMap.get("userId")) {
+      organizationIds =
+          userOrganizationMappingService.getOrganizationIdsByUserId(
+              queryMap.get("userId").toString());
+    }
     IPage<ReportGenerateRecord> iPage =
     IPage<ReportGenerateRecord> iPage =
         baseMapper.selectPage(
         baseMapper.selectPage(
             getPage(queryMap, "execute_time", false),
             getPage(queryMap, "execute_time", false),
@@ -89,7 +98,11 @@ public class YtReportGenerateRecordServiceImpl
                     null != startTime && null != endTime,
                     null != startTime && null != endTime,
                     ReportGenerateRecord::getExecuteTime,
                     ReportGenerateRecord::getExecuteTime,
                     startTime,
                     startTime,
-                    endTime));
+                    endTime)
+                .in(
+                    organizationIds != null && organizationIds.size() > 0,
+                    ReportGenerateRecord::getOrganizationId,
+                    organizationIds));
     return getPageData(iPage, ReportGenerateRecordDTO.class);
     return getPageData(iPage, ReportGenerateRecordDTO.class);
   }
   }
 
 
@@ -144,6 +157,7 @@ public class YtReportGenerateRecordServiceImpl
     dto.setJobId(jobId);
     dto.setJobId(jobId);
     dto.setReportConfigName(reportFormConfigDTO.getName());
     dto.setReportConfigName(reportFormConfigDTO.getName());
     dto.setOrganizationName(null != organizationDTO ? organizationDTO.getName() : null);
     dto.setOrganizationName(null != organizationDTO ? organizationDTO.getName() : null);
+    dto.setOrganizationId(null != organizationDTO ? organizationDTO.getId() : null);
     dto.setDataCompare(reportFormConfigDTO.getDataType());
     dto.setDataCompare(reportFormConfigDTO.getDataType());
     dto.setExecuteTime(time);
     dto.setExecuteTime(time);
     dto.setCreateTime(time);
     dto.setCreateTime(time);

@@ -79,11 +79,9 @@ public class YtVideoPlatformServiceImpl extends AbstractBaseService<YtVideoPlatf
     }
     }
 
 
     @Override
     @Override
-    public List<YtVideoPlatformDTO> getVideoPlatformsByUser(boolean isTenantAdmin, String tenantId,
-                                                            String customerUserId) {
+    public List<YtVideoPlatformDTO> getVideoPlatformsByUser(String tenantId) {
         return baseMapper.selectList(new LambdaQueryWrapper<YtVideoPlatformEntity>().
         return baseMapper.selectList(new LambdaQueryWrapper<YtVideoPlatformEntity>().
-                        eq(YtVideoPlatformEntity::getTenantId, tenantId)
-                        .eq(!isTenantAdmin, YtVideoPlatformEntity::getCreator, customerUserId)).stream()
+                        eq(YtVideoPlatformEntity::getTenantId, tenantId)).stream()
                 .map(ytVideoPlatformEntity -> ytVideoPlatformEntity
                 .map(ytVideoPlatformEntity -> ytVideoPlatformEntity
                         .getDTO(YtVideoPlatformDTO.class)).collect(Collectors.toList());
                         .getDTO(YtVideoPlatformDTO.class)).collect(Collectors.toList());
     }
     }

@@ -42,4 +42,12 @@ public interface UserOrganizationMappingService {
      * @return
      * @return
      */
      */
     List<String> getEnableOrganizationIds(boolean isPtTenantAdmin, String tenantId, String userId, String organizationId);
     List<String> getEnableOrganizationIds(boolean isPtTenantAdmin, String tenantId, String userId, String organizationId);
+
+    /**
+     * 比较一个组织与另一个用户查出来的组织相同的数据结果
+     * @param organizationIds 源组织
+     * @param userId 用户ID
+     * @return 返回相同的组织
+     */
+    List<String> compareOrganizationIdsByCustomerId(List<String> organizationIds,String userId);
 }
 }

@@ -8,7 +8,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import java.util.Map;
 import java.util.Map;
 
 
 public interface YtConfigurationCenterService {
 public interface YtConfigurationCenterService {
-  YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap);
+  YtPageData<ConfigurationCenterDTO> page(Map<String, Object> queryMap,boolean tenantAdmin);
 
 
   ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO);
   ConfigurationCenterDTO saveConfiguration(ConfigurationCenterDTO configurationCenterDTO);
 
 

@@ -15,7 +15,7 @@ public interface YtDataBoardService {
    * @param queryMap 分页查询条件
    * @param queryMap 分页查询条件
    * @return 分页数据
    * @return 分页数据
    */
    */
-  YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap);
+  YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap,boolean tenantAdmin);
 
 
   /**
   /**
    * 修改或保存数据看板
    * 修改或保存数据看板

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 public interface YtReportFormConfigService {
 public interface YtReportFormConfigService {
-  YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap);
+  YtPageData<ReportFormConfigDTO> page(Map<String, Object> queryMap,boolean tenantAdmin);
 
 
   ReportFormConfigDTO saveOrUpdateReportFormConfig(ReportFormConfigDTO report) throws SchedulerException;
   ReportFormConfigDTO saveOrUpdateReportFormConfig(ReportFormConfigDTO report) throws SchedulerException;
 
 

@@ -11,7 +11,7 @@ import java.util.Map;
 
 
 public interface YtReportGenerateRecordService {
 public interface YtReportGenerateRecordService {
 
 
-  YtPageData<ReportGenerateRecordDTO> page(Map<String, Object> queryMap);
+  YtPageData<ReportGenerateRecordDTO> page(Map<String, Object> queryMap,boolean tenantAdmin);
 
 
   ReportGenerateRecordDTO saveOrUpdateReportGenerateRecord(ReportGenerateRecordDTO recordDTO);
   ReportGenerateRecordDTO saveOrUpdateReportGenerateRecord(ReportGenerateRecordDTO recordDTO);
 
 

@@ -16,30 +16,27 @@ public interface YtVideoPlatformService extends BaseService<YtVideoPlatformEntit
      * @param tenantId        租户ID
      * @param tenantId        租户ID
      * @param currentUserId   用户ID
      * @param currentUserId   用户ID
      * @param host            流媒体地址
      * @param host            流媒体地址
-     * @return
      */
      */
     YtPageData<YtVideoPlatformDTO> page(IPage<YtVideoPlatformEntity> pageInfo,
     YtPageData<YtVideoPlatformDTO> page(IPage<YtVideoPlatformEntity> pageInfo,
                                         boolean isPtTenantAdmin, String tenantId, String currentUserId, String host);
                                         boolean isPtTenantAdmin, String tenantId, String currentUserId, String host);
 
 
-    /**
-     * @param dto
-     * @return
+    /** 保存或更新流媒体配置
+     * @param dto 流媒体配置信息
+     * @return 流媒体信息
      */
      */
     YtVideoPlatformDTO saveOrUpdate(YtVideoPlatformDTO dto);
     YtVideoPlatformDTO saveOrUpdate(YtVideoPlatformDTO dto);
 
 
-    /**
-     * @param deleteDTO
-     * @return
+    /** 删除流媒体配置
+     * @param deleteDTO 删除参数
+     * @return true成功 false失败
      */
      */
     boolean deleteDataByIds(DeleteDTO deleteDTO);
     boolean deleteDataByIds(DeleteDTO deleteDTO);
 
 
     /**
     /**
      * 获取当前用户的流媒体配置信息列表
      * 获取当前用户的流媒体配置信息列表
-     * @param isTenantAdmin 是否租户管理员
      * @param tenantId 租户ID
      * @param tenantId 租户ID
-     * @param customerUserId 客户ID
-     * @return
+     * @return 流媒体配置列表
      */
      */
-    List<YtVideoPlatformDTO> getVideoPlatformsByUser(boolean isTenantAdmin, String tenantId,String customerUserId);
+    List<YtVideoPlatformDTO> getVideoPlatformsByUser(String tenantId);
 
 
 }
 }