Merge branch 'master' into ljl0224

# Conflicts:
#	dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java

@@ -86,7 +86,8 @@ public class YtSceneLinkageController extends BaseController {
     queryMap.put("status", status);
     queryMap.put("organizationId", organizationId);
     queryMap.put("triggers", triggers);
-    return sceneLinkageService.page(queryMap, getCurrentUser().getCurrentTenantId());
+    queryMap.put("currentUser",getCurrentUser().getCurrentUserId());
+    return sceneLinkageService.page(queryMap, getCurrentUser().getCurrentTenantId(),getCurrentUser().isCustomerUser());
   }
 
   @ApiOperation(value = "删除")

@@ -43,6 +43,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
   private final DoConditionService doConditionService;
   private final DoActionService doActionService;
   private final UserMapper userMapper;
+  private final ConvertConfigMapper ruleEngineMapper;
+  private final ConvertConfigService ruleEngineService;
+  private final UserOrganizationMappingService userOrganizationMappingService;
   /**
    * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
    *
@@ -277,27 +280,18 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
    * @return SceneLinkageDTO 场景对象
    */
   @Override
-  @Transactional
-  public YtPageData<SceneLinkageDTO> page(Map<String, Object> queryMap, String tenantId) {
+  public YtPageData<SceneLinkageDTO> page(Map<String, Object> queryMap, String tenantId,boolean isCustomerUser) {
     queryMap.put("tenantId", tenantId);
     // 拿到传入的组织id
     String organizationId = (String) queryMap.get("organizationId");
     // 不为空
     if (null != organizationId && !StringUtils.isEmpty(organizationId)) {
-      // 新建组织集合
-      List<String> organizationIds = new ArrayList<>();
-      // 添加拿到的组织
-      organizationIds.add(organizationId);
-      // 查询该组织的所有子类
-      List<OrganizationDTO> organizationDTOS =
-          organizationMapper.findOrganizationTreeList(tenantId, organizationIds);
-      // 遍历组织id
-      List<String> queryOrganizationIds = new ArrayList<>();
-      organizationDTOS.forEach(
-          item -> {
-            queryOrganizationIds.add(item.getId());
-          });
-      queryMap.put("organizationIds", queryOrganizationIds);
+      queryMap.put("organizationIds", getQueryOrganizationIds(tenantId,Arrays.asList(organizationId)));
+    }
+    if(null == organizationId && isCustomerUser){
+        String currentUserId = (String) queryMap.get("currentUser");
+      List<String> ids = userOrganizationMappingService.getOrganizationIdsByUserId(currentUserId);
+      queryMap.put("organizationIds", getQueryOrganizationIds(tenantId,ids));
     }
     IPage<SceneLinkage> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<SceneLinkageDTO> scenePage = baseMapper.getScenePage(page, queryMap);
@@ -441,5 +435,15 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
 
     return JacksonUtil.convertValue(engineConfig, JsonNode.class);
   }
-
+  private List<String> getQueryOrganizationIds(String tenantId,List<String> organizationIds){
+    // 查询该组织的所有子类
+    List<OrganizationDTO> organizationDTOS =
+            organizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+    // 遍历组织id
+    List<String> queryOrganizationIds = new ArrayList<>();
+    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
+    Set<String> set = new HashSet<>();
+    set.addAll(queryOrganizationIds);
+    return new ArrayList<>(set);
+  }
 }

@@ -38,10 +38,12 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
 
     /**
      * 分页查询
-     * @param queryMap
+     * @param queryMap 查询条件
+     * @param tenantId 租户ID
+     * @param isCustomerUser true是客户 false不是
      * @return
      */
-    YtPageData<SceneLinkageDTO> page(Map<String, Object> queryMap, String tenantId);
+    YtPageData<SceneLinkageDTO> page(Map<String, Object> queryMap, String tenantId,boolean isCustomerUser);
 
     /**
      *  查找场景联动所有数据

@@ -36,7 +36,7 @@
             <if test="queryMap.status !=null">
                 AND s.status = #{queryMap.status}
             </if>
-            <if test="queryMap.organizationId !=null">
+            <if test="queryMap.organizationIds !=null">
                 AND s.organization_id IN
                 <foreach collection="queryMap.organizationIds" item="organizationId" open="(" separator="," close=")">
                     #{organizationId}