feat:1.数据流转增加组织字段以及过滤 2.任务中心增加组织字段以及过滤 3.组织更新时，同时更新用户与组织的绑定关系 4.系统通知普通租户管理员通知选择全部通知当前组织及以下及超级管理员

@@ -62,7 +62,6 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.PublicCustomerDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ViewType;
-import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.audit.AuditLogService;
@@ -89,7 +88,7 @@ import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
-import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
@@ -254,7 +253,7 @@ public abstract class BaseController {
 
 
     @Autowired
-    protected TkOrganizationService organizationService;
+    protected UserOrganizationMappingService userOrganizationMappingService;
 
     @ExceptionHandler(ThingsboardException.class)
     public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
@@ -1005,7 +1004,7 @@ public abstract class BaseController {
     }
 
     protected List<String> commonTenantOrganizationAllIds() throws ThingsboardException {
-      return   organizationService.currentUserOrganizationAllIds(getCurrentUser().getCurrentUserId());
+      return   userOrganizationMappingService.getOrganizationIdsByUserId(getCurrentUser().getCurrentUserId());
     }
 
 }

@@ -94,6 +94,9 @@ public class TkConvertDataToController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
+    if(getCurrentUser().isPtCommonTenant()){
+      queryMap.put("orgIds",commonTenantOrganizationAllIds());
+    }
     return convertConfigService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
 

@@ -85,7 +85,10 @@ public class TkNoticeController extends BaseController {
     public ResponseEntity<SysNoticeDTO> save(@Validated(AddGroup.class) @RequestBody SysNoticeDTO sysNoticeDTO) throws ThingsboardException {
         sysNoticeDTO.setStatus(FastIotConstants.DraftStatus.DRAFT);
         SysNoticeDTO newSysNoticeDTO =
-                sysNoticeService.save(sysNoticeDTO, getCurrentUser().getCurrentTenantId());
+                sysNoticeService.save(sysNoticeDTO,
+                        getCurrentUser().getCurrentTenantId(),
+                        getCurrentUser().isPtCommonTenant(),
+                        commonTenantOrganizationAllIds());
         return newSysNoticeDTO == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
     }
 
@@ -97,7 +100,9 @@ public class TkNoticeController extends BaseController {
                 sysNoticeService.send(
                         sysNoticeDTO,
                         getCurrentUser().getCurrentTenantId(),
-                        getCurrentUser().getCurrentUserId());
+                        getCurrentUser().getCurrentUserId(),
+                        getCurrentUser().isPtCommonTenant(),
+                        commonTenantOrganizationAllIds());
         return sysNoticeDto == null ? ResponseEntity.badRequest().build() : ResponseEntity.ok().build();
     }
 }

@@ -37,6 +37,10 @@ public class ConvertConfigDTO extends TenantDTO {
   @ApiModelProperty(value = "数据源内容")
   private JsonNode datasourceContent;
 
+  @ApiModelProperty(value = "组织id")
+  @NotEmpty(message = "组织不能为空或者空字符串")
+  private String organizationId;
+
   private transient Integer nodeType;
 
   private String remark;

@@ -46,4 +46,7 @@ public class TkTaskCenterDTO extends TenantDTO {
 
   @ApiModelProperty(value = "备注")
   private String remark;
+
+  @ApiModelProperty(value = "组织id")
+  private String organizationId;
 }

@@ -33,4 +33,5 @@ public class ConvertConfig extends TenantBaseEntity {
   private Integer status;
   private Integer nodeType;
   private String remark;
+  private String organizationId;
 }

@@ -31,4 +31,6 @@ public class TkTaskCenterEntity extends TenantBaseEntity {
   private Integer state;
 
   private String remark;
+
+  private String organizationId;
 }

@@ -67,7 +67,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
 
   @Override
   @Transactional
-  public SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId) {
+  public SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId,boolean isPtTenant, List<String> orgIds) {
     SysNoticeEntity sysNotice = sysNoticeDTO.getEntity(SysNoticeEntity.class);
     // 设置为草稿
     sysNotice.setTenantId(tenantId);
@@ -77,18 +77,29 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
             && StringUtils.isEmpty(sysNoticeDTO.getPointId()))) {
       throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.getMessage());
     }
-    List<String> userList;
+    List<String> userList = null;
     switch (sysNotice.getReceiverType()) {
       case FastIotConstants.ReceiverType.ALL:
-        // 获取全部用户ID
-        userList =
-            userMapper
-                .selectList(
-                    new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getTenantId, sysNotice.getTenantId()))
-                .stream()
-                .map(SysUserEntity::getId)
-                .distinct()
-                .collect(Collectors.toList());
+        //普通租户选全部只给当前组织及以下发送
+        if(isPtTenant){
+          userList =
+                  userOrganizationMappingService.getUserIdByOrganizationIds(
+                          tenantId,null, orgIds.toArray(new String[0]));
+          SysUserEntity tenantAdmin =  userMapper.selectOne( new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getTenantId, sysNotice.getTenantId())
+                  .eq(SysUserEntity::getLevel,2));
+          if(null!=tenantAdmin){
+            userList.add(tenantAdmin.getId());
+          }
+        }else {// 获取全部用户ID
+          userList =
+                  userMapper
+                          .selectList(
+                                  new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getTenantId, sysNotice.getTenantId()))
+                          .stream()
+                          .map(SysUserEntity::getId)
+                          .distinct()
+                          .collect(Collectors.toList());
+        }
         break;
       case FastIotConstants.ReceiverType.ORGANIZATION:
         // 判断传入的集合id是否为空
@@ -129,10 +140,10 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
 
   @Override
   @Transactional
-  public SysNoticeDTO send(SysNoticeDTO sysNoticeDTO, String tenantId, String currentUserId) {
+  public SysNoticeDTO send(SysNoticeDTO sysNoticeDTO, String tenantId, String currentUserId,boolean isPtTenant, List<String> orgIds) {
     SysNoticeEntity sysNotice;
     // 如果通知为空,则新增
-    sysNotice = save(sysNoticeDTO, tenantId).getEntity(SysNoticeEntity.class);
+    sysNotice = save(sysNoticeDTO, tenantId,isPtTenant,orgIds).getEntity(SysNoticeEntity.class);
     //获取当前发送者
     SysUserEntity user = userMapper.selectById(currentUserId);
     if (null != user) {

@@ -60,6 +60,9 @@ public class TkConvertConfigServiceImpl
                     ConvertConfig::getStatus,
                     queryMap.get("status"))
                 .eq(ConvertConfig::getNodeType, queryMap.get("nodeType"))
+                .in(null != queryMap.get("orgIds"),
+                            ConvertConfig::getOrganizationId,
+                        (List<String>)queryMap.get("orgIds"))
                 .and(
                     null != startTime && null != endTime,
                     qr ->
@@ -68,7 +71,8 @@ public class TkConvertConfigServiceImpl
                 .like(
                     null != queryMap.get("name"),
                     ConvertConfig::getName,
-                    String.valueOf(queryMap.get("name"))));
+                    String.valueOf(queryMap.get("name")))
+                );
     return getPageData(iPage, ConvertConfigDTO.class);
   }
 

@@ -71,7 +71,7 @@ public class TkHomePageServiceImpl implements HomePageService {
 
   private final TkDeviceProfileService tkDeviceProfileService;
 
-  private final TkOrganizationService organizationService;
+  private final SysUserOrganizationMappingServiceImpl sysUserOrganizationMappingServiceImpl;
 
   @Override
   public HomePageLeftTopDTO getHomePageLeftTopInfo(
@@ -119,7 +119,7 @@ public class TkHomePageServiceImpl implements HomePageService {
         long startTs = todayBegin.toInstant(ZoneOffset.of("+8")).toEpochMilli();
         if(isPtCommonTenant){
           //查询所有组织id
-          orgIds = organizationService.currentUserOrganizationAllIds(currentUserId);
+          orgIds = sysUserOrganizationMappingServiceImpl.getOrganizationIdsByUserId(currentUserId);
           queryMap.put("organizationIds",orgIds);
           alarmList = deviceMapper.findDeviceAlarmInfoByCustomer(startTs, null,orgIds);
           //查询所有设备

@@ -20,6 +20,7 @@ import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
+import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -204,11 +205,81 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     (StringUtils.isNotEmpty(parentId)&&!parentId.equals(sourceParentOrganizationId))){//正常变化
       invalidateParentAndMeCacheByTenantIdAndId(tenantId,false,sourceParentOrganizationId,parentId);
     }
-
+    //获取组织修改之前原上级与目标上级所绑定的用户
+    List<Map<String,String>> userOrgList =  getUserOrgMap(getUserByOrganizationIds(parentId),getUserByOrganizationIds(sourceParentOrganizationId));
     baseMapper.updateById(organization);
+    //组织修改过后更新原上级与目标上级用户绑定的组织
+    for (Map<String,String> userOrg:userOrgList){
+      String user = userOrg.get("userId");
+      String org =  userOrg.get("orgId");
+      List<String>orgIds = organizationAllIds(tenantId, org);
+      addOrUpdateUserOrganizationMapping(user,orgIds);
+    }
     return organizationDTO;
   }
 
+  public void addOrUpdateUserOrganizationMapping(
+          String userId, List<String> organizationIds) {
+    if (StringUtils.isEmpty(userId) || null == organizationIds || organizationIds.size() < 1) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    // 先删除,再新增
+    userOrganizationMappingMapper.delete(
+            new LambdaQueryWrapper<TkUserOrganizationMappingEntity>()
+                    .eq(TkUserOrganizationMappingEntity::getUserId, userId));
+    organizationIds.forEach(
+            organizationId -> {
+              TkUserOrganizationMappingEntity userOrganizationMapping = new TkUserOrganizationMappingEntity();
+              userOrganizationMapping.setUserId(userId);
+              userOrganizationMapping.setOrganizationId(organizationId);
+              userOrganizationMappingMapper.insert(userOrganizationMapping);
+            });
+  }
+
+  List<Map<String,String>> getUserOrgMap(List<String>newUserIds ,List<String> oldUserIds){
+    //目标上级原本绑定的用户 newUserIds
+    //原上级原本绑定的用户 oldUserIds
+    List<Map<String,String>> userOrgList = new ArrayList<>();
+    for (String oldUserId:oldUserIds) {
+      Map<String,String> map  = new HashMap<>();
+      map.put("userId",oldUserId);
+      map.put("orgId",  getOrganizationIdsByUser(oldUserId).get(0));
+      userOrgList.add(map);
+    }
+    for (String newUserId:newUserIds) {
+      Map<String,String> map  = new HashMap<>();
+      map.put("userId",newUserId);
+      map.put("orgId",  getOrganizationIdsByUser(newUserId).get(0));
+      userOrgList.add(map);
+    }
+    return userOrgList;
+  }
+  // 获取当前组织的用户id集
+  List<String> getUserByOrganizationIds(String ogrId){
+    if (StringUtils.isEmpty(ogrId)) {
+      return  null;
+    }
+    return userOrganizationMappingMapper
+            .selectList(
+                    new QueryWrapper<TkUserOrganizationMappingEntity>()
+                            .lambda()
+                            .eq(TkUserOrganizationMappingEntity::getOrganizationId, ogrId))
+            .stream()
+            .map(TkUserOrganizationMappingEntity::getUserId)
+            .collect(Collectors.toList());
+  }
+  // 获取当前用户的组织id集
+  List<String> getOrganizationIdsByUser(String userId){
+    return userOrganizationMappingMapper
+            .selectList(
+                    new QueryWrapper<TkUserOrganizationMappingEntity>()
+                            .lambda()
+                            .in(TkUserOrganizationMappingEntity::getUserId, userId))
+            .stream()
+            .map(TkUserOrganizationMappingEntity::getOrganizationId)
+            .collect(Collectors.toList());
+  }
+
   @Override
   public List<OrganizationDTO> getMyOrganizations(
       boolean isPtSysAdmin, boolean isPtTenantAdmin,boolean isCustomer, boolean isPtCommonTenant, String tenantId, String currentUserId,String organizationId) {
@@ -218,10 +289,7 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       return findOrganizationTree(tenantId,organizationIds);
     } else {
       // 返回当前用户组织id集
-      Set<String> organizationIds =getUserOrganizationIds(currentUserId);
-      if(!StringUtils.isEmpty(organizationId)){
-        organizationIds = new HashSet<>(List.of(organizationId));
-      }
+      List<String> organizationIds =getOrganizationIdsByUser(currentUserId);
       if (organizationIds.size() > 0) {
         return findOrganizationTree(tenantId, new ArrayList<>(organizationIds));
       } else {
@@ -231,17 +299,6 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
   }
 
-  // 获取当前用户组织id集
-  Set<String> getUserOrganizationIds(String currentUserId){
-        return   userOrganizationMappingMapper
-                    .selectList(
-                            new QueryWrapper<TkUserOrganizationMappingEntity>()
-                                    .lambda()
-                                    .in(TkUserOrganizationMappingEntity::getUserId, currentUserId))
-                    .stream()
-                    .map(TkUserOrganizationMappingEntity::getOrganizationId)
-                    .collect(Collectors.toSet());
-  }
 
 
 
@@ -387,18 +444,6 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     });
   }
 
-  /**
-   * 当前用户多个组织结构下的所有组织ID
-   *
-   * @param currentUserId 当前用户id
-   */
-  @Override
-  public List<String> currentUserOrganizationAllIds(String currentUserId) {
-    Set<String> organizationIds =  getUserOrganizationIds(currentUserId);
-    List<String> clearOrgId = new ArrayList<>();
-    organizationIds.forEach(item ->clearOrgId.add(item));
-    return clearOrgId;
-  }
 
   @Override
   public List<OrganizationDTO> findOrganizationTreeList(String tenantId, OrganizationEnum sort, Collection<String> organizationIds) {

@@ -54,18 +54,6 @@ public class TkTaskCenterServiceImpl
     IPage<TkTaskCenterEntity> page =
         getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<TkTaskCenterDTO> iPage = baseMapper.getPageData(page, queryMap);
-    List<String> orgIds = (List<String>) queryMap.get("orgIds");
-    if(null!=orgIds&&!iPage.getRecords().isEmpty()){
-      List<TkTaskCenterDTO> list  = new ArrayList<>();
-      iPage.getRecords().stream().forEach(dto->{
-        orgIds.forEach(orgId-> {
-          if(dto.getExecuteTarget().getOrganizationId().equals(orgId)){
-            list.add(dto);
-          }
-        });
-      });
-      iPage.setRecords(list);
-    }
     if (!iPage.getRecords().isEmpty()) {
       iPage.setRecords(
           iPage.getRecords().stream()

@@ -4,6 +4,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SysNoticeDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.SysNoticeEntity;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -20,7 +21,7 @@ public interface SysNoticeService extends BaseService<SysNoticeEntity>{
 
   boolean delete(Set<String> ids, String tenantId);
 
-  SysNoticeDTO save(SysNoticeDTO sysNoticeDTO,String tenantId);
+  SysNoticeDTO save(SysNoticeDTO sysNoticeDTO, String tenantId, boolean isPtTenant, List<String> orgIds);
 
-  SysNoticeDTO send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId);
+  SysNoticeDTO send(SysNoticeDTO sysNoticeDTO,String tenantId,String currentUserId,boolean isPtTenant, List<String> orgIds);
 }

@@ -32,12 +32,6 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
    */
   List<String> organizationAllIds(String tenantId, String organizationId);
 
-  /**
-   * 组织结构下的所有组织ID
-   *
-   * @param currentUserId 当前用户id
-   */
-  List<String> currentUserOrganizationAllIds(String currentUserId);
 
   List<OrganizationDTO> findOrganizationTreeList(String tenantId, OrganizationEnum sort, Collection<String> organizationIds);
 

@@ -18,6 +18,7 @@
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="tenantId" column="tenant_id" />
+        <result property="organizationId" column="organization_id" />
         <association property="tkDeviceTaskCenter" javaType="org.thingsboard.server.common.data.yunteng.dto.task.TkDeviceTaskCenterDTO">
             <result property="allowState" column="allow_state"/>
             <result property="taskCenterId" column="task_center_id"/>
@@ -29,7 +30,7 @@
 
     <sql id="basicColumns">
         tc.id,tc.name,tc.target_type,tc.execute_target,tc.execute_content,tc.execute_time,tc.create_time,tc.creator,
-        tc.updater,tc.update_time,tc.tenant_id,tc.state
+        tc.updater,tc.update_time,tc.tenant_id,tc.state,tc.organization_id
     </sql>
     <select id="getPageData" resultMap="dataMap">
         SELECT
@@ -54,6 +55,12 @@
             <if test="queryMap.tbDeviceId !=null and queryMap.tbDeviceId !=''">
                 AND tdc.tb_device_id = #{queryMap.tbDeviceId}
             </if>
+            <if test="queryMap.orgIds !=null and queryMap.orgIds.size() &gt; 0">
+                AND organization_id IN
+                <foreach collection="queryMap.orgIds" item="organizationId" open="(" separator="," close=")">
+                    #{organizationId}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>