fix: 修改告警联系人分页查询BUG【客户查询只能查询他拥有的组织告警联系人】

@@ -78,7 +78,11 @@ public class YtAlarmContactController extends BaseController {
       queryMap.put("organizationId", organizationId);
       queryMap.put("organizationId", organizationId);
     }
     }
     queryMap.put(CREATE_TIME, createtime);
     queryMap.put(CREATE_TIME, createtime);
-    return alarmService.page(getCurrentUser().getCurrentTenantId(),queryMap);
+    return alarmService.page(
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentUserId(),
+        queryMap);
   }
   }
 
 
   @ApiOperation(value = "删除")
   @ApiOperation(value = "删除")

@@ -16,7 +16,9 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.AlarmContactMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
+import org.thingsboard.server.dao.yunteng.mapper.UserOrganizationMappingMapper;
 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.YtAlarmContactService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmContactService;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -33,6 +35,8 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   private final AlarmContactMapper alarmContactMapper;
   private final AlarmContactMapper alarmContactMapper;
 
 
   private final OrganizationMapper ytOrganizationMapper;
   private final OrganizationMapper ytOrganizationMapper;
+
+  private final UserOrganizationMappingService userOrganizationMappingService;
   /**
   /**
    * 查询全部的告警联系人
    * 查询全部的告警联系人
    *
    *
@@ -40,7 +44,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
    * @return List
    * @return List
    */
    */
   @Override
   @Override
-  public List<AlarmContactDTO> findAll(String tenantId,Map<String, Object> params) {
+  public List<AlarmContactDTO> findAll(String tenantId, Map<String, Object> params) {
     // 查询当前租户
     // 查询当前租户
     List<AlarmContact> list =
     List<AlarmContact> list =
         alarmContactMapper.selectList(
         alarmContactMapper.selectList(
@@ -63,7 +67,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
   /**
   /**
    * 新增租户
    * 新增租户
    *
    *
-   * @param tenantId  租户编码
+   * @param tenantId 租户编码
    * @return alarmContactDTO
    * @return alarmContactDTO
    */
    */
   private LambdaQueryWrapper<AlarmContact> tenantWapper(String tenantId) {
   private LambdaQueryWrapper<AlarmContact> tenantWapper(String tenantId) {
@@ -72,7 +76,7 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
 
 
   @Override
   @Override
   @Transactional
   @Transactional
-  public AlarmContactDTO saveAlarmContact(String tenantId,AlarmContactDTO alarmContactDTO) {
+  public AlarmContactDTO saveAlarmContact(String tenantId, AlarmContactDTO alarmContactDTO) {
     LambdaQueryWrapper<AlarmContact> Wrapper =
     LambdaQueryWrapper<AlarmContact> Wrapper =
         tenantWapper(tenantId).eq(AlarmContact::getUsername, alarmContactDTO.getUsername());
         tenantWapper(tenantId).eq(AlarmContact::getUsername, alarmContactDTO.getUsername());
     int Count = baseMapper.selectCount(Wrapper);
     int Count = baseMapper.selectCount(Wrapper);
@@ -131,25 +135,32 @@ public class YtAlarmContactServiceImpl extends AbstractBaseService<AlarmContactM
    * @return PageData
    * @return PageData
    */
    */
   @Override
   @Override
-  @Transactional
-  public YtPageData<AlarmContactDTO> page(String tenantId,Map<String, Object> queryMap) {
+  public YtPageData<AlarmContactDTO> page(
+      String tenantId,
+      boolean isPtTenantAdmin,
+      String currentUserId,
+      Map<String, Object> queryMap) {
     // 查询分页,加入条模糊条件查询
     // 查询分页,加入条模糊条件查询
+    String organizationId = (String) queryMap.get("organizationId");
     queryMap.put("tenantId", tenantId);
     queryMap.put("tenantId", tenantId);
-    String organizationId= (String) queryMap.get("organizationId");
-    //传入的组织id不为空
-    if (!StringUtils.isEmpty(organizationId)){
-        List<String> organizationIds= new ArrayList<>();
-        organizationIds.add(organizationId);
-    //查询该组织的所有子类
-      List<OrganizationDTO> organizationDTOS=ytOrganizationMapper.findOrganizationTreeList(tenantId,organizationIds);
+    if (StringUtils.isNotEmpty(organizationId)) {
+      List<String> ids = new ArrayList<>();
+      ids.add(organizationId);
+      // 查询该组织的所有子类
+      List<OrganizationDTO> organizationDTOS =
+          ytOrganizationMapper.findOrganizationTreeList(tenantId, ids);
       List<String> queryOrganizationIds = new ArrayList<>();
       List<String> queryOrganizationIds = new ArrayList<>();
-      organizationDTOS.forEach(item->{
-        queryOrganizationIds.add(item.getId());
-      });
-      queryMap.put("organizationIds",queryOrganizationIds);
+      organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
+      queryMap.put("organizationIds", queryOrganizationIds);
+    } else {
+      if (!isPtTenantAdmin) {
+        List<String> queryOrganizationIds =
+            userOrganizationMappingService.getOrganizationIdsByUserId(currentUserId);
+        queryMap.put("organizationIds", queryOrganizationIds);
+      }
     }
     }
-   IPage<AlarmContact> page= getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
-    IPage<AlarmContactDTO> pageDto= baseMapper.getAlarmPage(page,queryMap);
+    IPage<AlarmContact> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<AlarmContactDTO> pageDto = baseMapper.getAlarmPage(page, queryMap);
     return getPageData(pageDto, AlarmContactDTO.class);
     return getPageData(pageDto, AlarmContactDTO.class);
   }
   }
 }
 }

@@ -7,53 +7,46 @@ import org.thingsboard.server.dao.yunteng.entities.AlarmContact;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
-
-/**
- * @Description 告警联系人的操作方法
- * @Author cxy
- * @Date 2021/11/2 14:46
- */
-
-public interface YtAlarmContactService extends BaseService<AlarmContact>{
-    /**
-     * 查询全部的告警联系人
-     *
-     * @param
-     * @return List
-     */
-    List<AlarmContactDTO> findAll(String tenantId,Map<String,Object> params);
-
-    /**
-     * 添加告警联系人
-     *
-     * @param alarmContactDTO 对象
-     * @return AlarmContactDTO
-     */
-    AlarmContactDTO saveAlarmContact(String tenantId,AlarmContactDTO alarmContactDTO);
-
-    /**
-     * 删除告警联系人
-     *
-     * @param ids 通过列表id
-     * @return i
-     */
-    boolean delete(String[]ids);
-
-
-    /**
-     * 修改告警联系人数据
-     *
-     * @param alarmContactDTO 对象
-     * @return Integer
-     */
-    boolean update(AlarmContactDTO alarmContactDTO);
-
-    /**
-     * 分页查询
-     *
-     * @param queryMap 查询集合
-     * @return PageData
-     */
-    YtPageData<AlarmContactDTO> page(String tenantId,Map<String, Object> queryMap);
-
+/** @Description 告警联系人的操作方法 @Author cxy @Date 2021/11/2 14:46 */
+public interface YtAlarmContactService extends BaseService<AlarmContact> {
+  /**
+   * 查询全部的告警联系人
+   *
+   * @param
+   * @return List
+   */
+  List<AlarmContactDTO> findAll(String tenantId, Map<String, Object> params);
+
+  /**
+   * 添加告警联系人
+   *
+   * @param alarmContactDTO 对象
+   * @return AlarmContactDTO
+   */
+  AlarmContactDTO saveAlarmContact(String tenantId, AlarmContactDTO alarmContactDTO);
+
+  /**
+   * 删除告警联系人
+   *
+   * @param ids 通过列表id
+   * @return i
+   */
+  boolean delete(String[] ids);
+
+  /**
+   * 修改告警联系人数据
+   *
+   * @param alarmContactDTO 对象
+   * @return Integer
+   */
+  boolean update(AlarmContactDTO alarmContactDTO);
+
+  /**
+   * 分页查询
+   *
+   * @param queryMap 查询集合
+   * @return PageData
+   */
+  YtPageData<AlarmContactDTO> page(
+      String tenantId, boolean isPtTenantAdmin, String currentUserId, Map<String, Object> queryMap);
 }
 }