简柏林 / thingskit · Commits

Commit 82c2862b98a4c174a593f63c4dcd53d0677ce2f5

Authored by chenjunyu_1481036421
1 parent 4338eca0

feat:组织递归查询增加向上向下参数并更改以前的所有向下

Inline Side-by-side
Showing 4 changed files with 10 additions and 7 deletions
@@ -99,7 +99,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S @@ -99,7 +99,7 @@ public class SysNoticeServiceImpl extends AbstractBaseService<SysNoticeMapper, S
99 //把拿到的数据用,分割成数组 99 //把拿到的数据用,分割成数组
100 userList = 100 userList =
101 userOrganizationMappingService.getUserIdByOrganizationIds( 101 userOrganizationMappingService.getUserIdByOrganizationIds(
102 - tenantId, sysNoticeDTO.getPointId().split(",")); 102 + tenantId,null, sysNoticeDTO.getPointId().split(","));
103 break; 103 break;
104 default: 104 default:
105 throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.getMessage()); 105 throw new EntityCreationException(ErrorMessage.SEND_DESTINATION_NOT_FOUND.getMessage());
@@ -38,9 +38,9 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa @@ -38,9 +38,9 @@ public class SysUserOrganizationMappingServiceImpl implements UserOrganizationMa
38 private final TkOrganizationService organizationService; 38 private final TkOrganizationService organizationService;
39 39
40 @Override 40 @Override
41 - public List<String> getUserIdByOrganizationIds(String tenantId, String... ids) { 41 + public List<String> getUserIdByOrganizationIds(String tenantId,OrganizationEnum sort , String... ids) {
42 List<String> collect = 42 List<String> collect =
43 - organizationService.findOrganizationTreeList(tenantId, OrganizationEnum.UP, List.of(ids)).stream() 43 + organizationService.findOrganizationTreeList(tenantId, sort, List.of(ids)).stream()
44 .map(OrganizationDTO::getId) 44 .map(OrganizationDTO::getId)
45 .collect(Collectors.toList()); 45 .collect(Collectors.toList());
46 if (null == collect || collect.size() == 0) { 46 if (null == collect || collect.size() == 0) {
@@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.yunteng.dto.*; @@ -34,6 +34,7 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
34 import org.thingsboard.server.common.data.yunteng.dto.request.*; 34 import org.thingsboard.server.common.data.yunteng.dto.request.*;
35 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum; 35 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
36 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum; 36 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
  37 +import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
37 import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum; 38 import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
38 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils; 39 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
39 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData; 40 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
@@ -329,7 +330,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE @@ -329,7 +330,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
329 queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null; 330 queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
330 List<String> userIds = null; 331 List<String> userIds = null;
331 if (null != organizationId) { 332 if (null != organizationId) {
332 - userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId); 333 + userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,null, organizationId);
333 queryMap.put("userIds", userIds); 334 queryMap.put("userIds", userIds);
334 } 335 }
335 if (isPtSysadmin) { 336 if (isPtSysadmin) {
@@ -577,7 +578,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE @@ -577,7 +578,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
577 if (group == null || !group.getTenantId().equals(tenantId)) { 578 if (group == null || !group.getTenantId().equals(tenantId)) {
578 return Optional.empty(); 579 return Optional.empty();
579 } 580 }
580 - List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId()); 581 + List<String> userIds = userOrganizationMappingService.getUserIdByOrganizationIds(group.getId(),null);
581 List<SysUserEntity> users = baseMapper.selectBatchIds(userIds); 582 List<SysUserEntity> users = baseMapper.selectBatchIds(userIds);
582 return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class)); 583 return Optional.ofNullable(ReflectUtils.sourceToTarget(users, UserDTO.class));
583 } 584 }
@@ -662,7 +663,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE @@ -662,7 +663,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
662 } 663 }
663 if (isTenantAdmin) { 664 if (isTenantAdmin) {
664 List<String> userList = 665 List<String> userList =
665 - userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId); 666 + userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, OrganizationEnum.UP, organizationId);
666 if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) { 667 if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
667 return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList); 668 return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
668 } 669 }
1 package org.thingsboard.server.dao.yunteng.service; 1 package org.thingsboard.server.dao.yunteng.service;
2 2
  3 +import org.thingsboard.server.common.data.yunteng.enums.OrganizationEnum;
  4 +
3 import java.util.List; 5 import java.util.List;
4 import java.util.Set; 6 import java.util.Set;
5 7
@@ -10,7 +12,7 @@ import java.util.Set; @@ -10,7 +12,7 @@ import java.util.Set;
10 */ 12 */
11 public interface UserOrganizationMappingService { 13 public interface UserOrganizationMappingService {
12 14
13 - List<String> getUserIdByOrganizationIds(String tenantId, String... ids); 15 + List<String> getUserIdByOrganizationIds(String tenantId, OrganizationEnum sort , String... ids);
14 16
15 /** 17 /**
16 * 添加或更新用户组织关系 18 * 添加或更新用户组织关系