Merge branch 'master' into ljl1207

@@ -293,7 +293,7 @@ public abstract class BaseController {
         errorResponseHandler.handle(ex, response);
     }
 
-    ThingsboardException handleException(Exception exception) {
+    protected ThingsboardException handleException(Exception exception) {
         return handleException(exception, true);
     }
 
@@ -446,7 +446,7 @@ public abstract class BaseController {
         }
     }
 
-    User checkUserId(UserId userId, Operation operation) throws ThingsboardException {
+    protected User checkUserId(UserId userId, Operation operation) throws ThingsboardException {
         try {
             validateId(userId, "Incorrect userId " + userId);
             User user = userService.findUserById(getCurrentUser().getTenantId(), userId);

@@ -50,18 +50,21 @@ public class YtOrganizationController extends BaseController {
   }
 
   @GetMapping("/me/organizations")
-  public List<OrganizationDTO> getMyOrganizations() {
-    return organizationService.getMyOrganizations();
+  public List<OrganizationDTO> getMyOrganizations() throws ThingsboardException {
+    return organizationService.getMyOrganizations(
+        getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId());
   }
 
   @PutMapping
-  public OrganizationDTO updateOrganization(@Validated(UpdateGroup.class) @RequestBody OrganizationDTO groupDTO) {
-    return organizationService.updateOrganization(groupDTO);
+  public OrganizationDTO updateOrganization(@Validated(UpdateGroup.class) @RequestBody OrganizationDTO groupDTO) throws ThingsboardException {
+    return organizationService.updateOrganization(groupDTO, getCurrentUser().getCurrentTenantId());
   }
 
   @PutMapping("saveOrUpdateUserOrganizationMapping/{userId}")
   public void bindUserToOrganization(
-      @RequestBody String[] organizationIds, @PathVariable("userId") String userId) {
-    organizationService.bindUserToOrganization(userId, organizationIds);
+      @RequestBody String[] organizationIds, @PathVariable("userId") String userId) throws ThingsboardException {
+    organizationService.bindUserToOrganization(getCurrentUser().getCurrentTenantId(), userId, organizationIds);
   }
 }

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
@@ -16,9 +17,14 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 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.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.utils.Demo;
 import org.thingsboard.server.common.data.yunteng.utils.ExcelUtil;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
@@ -33,6 +39,9 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.UserPrincipal;
+import org.thingsboard.server.service.security.permission.Operation;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -49,7 +58,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 @Api(value = "用户接口")
 public class YtUserController extends BaseController {
-
+  private final BCryptPasswordEncoder passwordEncoder;
   private final YtUserService userService;
   private final UserService tbUserService;
   @GetMapping("{userId}")
@@ -140,17 +149,38 @@ public class YtUserController extends BaseController {
   @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
   @PostMapping("saveTenantAdmin")
   public UserDTO saveTenantAdmin(@Validated(AddGroup.class)@RequestBody UserDTO userDTO) throws ThingsboardException {
-    //创建TB的租户管理员
-    User tbUser = new User();
+    if(StringUtils.isAllBlank(userDTO.getTenantId())){
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
     TenantId tenantId = new TenantId(UUID.fromString(userDTO.getTenantId()));
-    tbUser.setTenantId(tenantId);
-    tbUser.setEmail(userDTO.getUsername()+ FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB);
-    tbUser = tbUserService.saveUser(tbUser);
-    logEntityAction(tbUser.getId(), tbUser,
-            tbUser.getCustomerId(),
-            userDTO.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
-    sendEntityNotificationMsg(tenantId, tbUser.getId(),
-            userDTO.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+    try{
+      //创建TB的租户管理员
+      User tbUser = new User();
+      tbUser.setAuthority(Authority.TENANT_ADMIN);
+      tbUser.setTenantId(tenantId);
+      tbUser.setEmail(userDTO.getUsername()+ FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB);
+      tbUser = tbUserService.saveUser(tbUser);
+      userDTO.setTbUser(tbUser.getId().getId().toString());
+      logEntityAction(tbUser.getId(), tbUser,
+              tbUser.getCustomerId(),
+              userDTO.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null);
+      sendEntityNotificationMsg(tenantId, tbUser.getId(),
+              userDTO.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+
+      //激活租户管理员
+      //1、获取UserCredentials 并获取activateToken
+      UserId userId = tbUser.getId();
+      User user = checkUserId(userId, Operation.READ);
+      SecurityUser authUser = getCurrentUser();
+      UserCredentials userCredentials = tbUserService.findUserCredentialsByUserId(authUser.getTenantId(), user.getId());
+      //2、进行激活
+      String encodedPassword = passwordEncoder.encode(FastIotConstants.DEFAULT_PWD);
+      UserCredentials credentials = tbUserService.activateUserCredentials(TenantId.SYS_TENANT_ID, userCredentials.getActivateToken(), encodedPassword);
+      User currentUser = tbUserService.findUserById(TenantId.SYS_TENANT_ID, credentials.getUserId());
+      tbUserService.setUserCredentialsEnabled(currentUser.getTenantId(), currentUser.getId(), true);
+    }catch (Exception e){
+      throw handleException(e);
+    }
     return userService.saveTenantAdmin(
         userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
   }

@@ -4,6 +4,9 @@ import java.util.regex.Pattern;
 
 public interface FastIotConstants {
 
+  /** 默认密码 */
+  public static final String DEFAULT_PWD = "123456";
+
   class DefaultOrder {
     public static final String CREATE_TIME="create_time";
   }

 package org.thingsboard.server.common.data.yunteng.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,7 +23,6 @@ public class UserDTO extends BaseDTO {
   private String realName;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)
-  @NotEmpty(message = "密码不能为空或空字符串", groups = AddGroup.class)
   private String password;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -37,6 +37,10 @@ public class UserDTO extends BaseDTO {
   private String phoneNumber;
   private String email;
   private String avatar;
+  /** TB的UserId 不序列化到前端*/
+  @JsonIgnore
+  private String tbUser;
+
   private boolean enabled;
 
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -45,7 +49,6 @@ public class UserDTO extends BaseDTO {
   private boolean hasPassword;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)
-  @NotEmpty(message = "租户ID不能为空或者空字符串", groups = AddGroup.class)
   private String tenantId;
 
   @JsonInclude(JsonInclude.Include.NON_NULL)

@@ -36,6 +36,9 @@ public class User extends TenantBaseEntity {
 
   private String deptId;
 
+  /** TB的UserId */
+  private String tbUser;
+
   /** 0：超级管理员；1：租户账号；2：租户下的账号 */
   private Integer level;
 }

@@ -12,9 +12,12 @@ import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 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.utils.ReflectUtils;
+import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
 import org.thingsboard.server.dao.yunteng.entities.UserOrganizationMapping;
 import org.thingsboard.server.dao.yunteng.entities.Organization;
 import org.thingsboard.server.dao.yunteng.entities.User;
+import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
@@ -36,16 +39,14 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
   @Override
   @Transactional
-  public OrganizationDTO saveOrganization(OrganizationDTO organizationDTO,String tenantId) {
+  public OrganizationDTO saveOrganization(OrganizationDTO organizationDTO, String tenantId) {
     Assert.notNull(organizationDTO.getName(), "organization name cannot be null");
     if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
       Organization organization = baseMapper.selectById(organizationDTO.getParentId());
       if (organization == null) {
         throw new YtDataValidationException("parent organization not exist!");
       } else {
-        if (!organization
-            .getTenantId()
-            .equals(null)) {//TODO getCurrentUser().getTenantId()
+        if (!organization.getTenantId().equals(tenantId)) {
           throw new YtDataValidationException("parent organization not exist.");
         }
       }
@@ -60,16 +61,13 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
   @Override
   @Transactional
-  public boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId) {
-    if(null == deleteDTO || deleteDTO.getIds().isEmpty()){
+  public boolean deleteOrganizations(DeleteDTO deleteDTO, String tenantId) {
+    if (null == deleteDTO || deleteDTO.getIds().isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     String[] ids = deleteDTO.getIds().toArray(new String[deleteDTO.getIds().size()]);
     Set<String> idToDelete =
-        baseMapper
-            .findOrganizationTreeList(
-                null, Arrays.asList(ids))//TODO getCurrentUser().getTenantId()
-            .stream()
+        baseMapper.findOrganizationTreeList(tenantId, Arrays.asList(ids)).stream()
             .map(OrganizationDTO::getId)
             .collect(Collectors.toSet());
     if (idToDelete.size() != ids.length) {
@@ -84,16 +82,17 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
       throw new YtDataValidationException("待删除数据存在关联用户,不能删除!");
     }
     // 查询是否有设备使用该组织
-//    List<Device> deviceList = deviceMapper.selectList(
-//        new QueryWrapper<Device>()
-//            .lambda()
-//            .eq(Device::getTenantId, getCurrentUser().getTenantId())
-//            .eq(Device::getOrganizationId,ids));
-//    if (!deviceList.isEmpty()) {
-//      throw new DataValidationException("待删除数据存在关联设备,不能删除!");
-//    }
+    List<YtDevice> deviceList =
+        deviceMapper.selectList(
+            new QueryWrapper<YtDevice>()
+                .lambda()
+                .eq(YtDevice::getTenantId, tenantId)
+                .eq(YtDevice::getOrganizationId, ids));
+    if (!deviceList.isEmpty()) {
+      throw new YtDataValidationException("待删除数据存在关联设备,不能删除!");
+    }
     doDeleteUserOrganizationMapping(idToDelete);
-    return baseMapper.deleteBatchIds(idToDelete)>0;
+    return baseMapper.deleteBatchIds(idToDelete) > 0;
   }
 
   private void doDeleteUserOrganizationMapping(Collection<String> organizationIds) {
@@ -105,63 +104,58 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
   @Override
   @Transactional
-  public OrganizationDTO updateOrganization(OrganizationDTO organizationDTO) {
-//    Organization organization = baseMapper.selectById(organizationDTO.getId());
-//    Organization parent = null;
-//    if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
-//      Organization parentOrganization = baseMapper.selectById(organizationDTO.getParentId());
-//      if (parentOrganization
-//          .getTenantId()
-//          .equals(getCurrentUser().getTenantId())) {
-//        parent = parentOrganization;
-//      }
-//    }
-//    if (organization == null) {
-//      return null;
-//    }
-//    if (organization.getName().equals(organizationDTO.getName())
-//        && organization.getSort() == organizationDTO.getSort()
-//        && organization.getRemark().equals(organizationDTO.getRemark())
-//        && Objects.equals(organization.getParentId(), organizationDTO.getParentId())) {
-//      return organizationDTO;
-//    }
-//    organization.setName(organizationDTO.getName());
-//    organization.setRemark(organizationDTO.getRemark());
-//    organization.setSort(organizationDTO.getSort());
-//    if (parent != null) {
-//      organization.setParentId(parent.getId());
-//    }
-//    baseMapper.updateById(organization);
-//    organization.copyToDTO(organizationDTO);
-//    return organizationDTO;
-    return null;
+  public OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId) {
+    Organization organization = baseMapper.selectById(organizationDTO.getId());
+    Organization parent = null;
+    if (StringUtils.isNotBlank(organizationDTO.getParentId())) {
+      Organization parentOrganization = baseMapper.selectById(organizationDTO.getParentId());
+      if (parentOrganization.getTenantId().equals(tenantId)) {
+        parent = parentOrganization;
+      }
+    }
+    if (organization == null) {
+      return null;
+    }
+    if (organization.getName().equals(organizationDTO.getName())
+        && organization.getSort() == organizationDTO.getSort()
+        && organization.getRemark().equals(organizationDTO.getRemark())
+        && Objects.equals(organization.getParentId(), organizationDTO.getParentId())) {
+      return organizationDTO;
+    }
+    organization.setName(organizationDTO.getName());
+    organization.setRemark(organizationDTO.getRemark());
+    organization.setSort(organizationDTO.getSort());
+    if (parent != null) {
+      organization.setParentId(parent.getId());
+    }
+    baseMapper.updateById(organization);
+    organization.copyToDTO(organizationDTO);
+    return organizationDTO;
   }
 
   @Override
-  public List<OrganizationDTO> getMyOrganizations() {
-//    if (getCurrentUser().isTenantAdmin()) {
-//      return findOrganizationTree(getCurrentUser().getTenantId());
-//    } else {
-//      Set<String> organizationIds =
-//          userOrganizationMappingMapper
-//              .selectList(
-//                  new QueryWrapper<UserOrganizationMapping>()
-//                      .lambda()
-//                      .in(
-//                          UserOrganizationMapping::getUserId,
-//                          getCurrentUser().getUserId()))
-//              .stream()
-//              .map(UserOrganizationMapping::getOrganizationId)
-//              .collect(Collectors.toSet());
-//      List<Organization> organizations =
-//          baseMapper.selectList(
-//              new QueryWrapper<Organization>()
-//                  .lambda()
-//                  .eq(Organization::getTenantId, getCurrentUser().getTenantId())
-//                  .in(organizationIds.size() > 0, Organization::getId, organizationIds));
-//      return TreeUtils.buildTree(ReflectUtils.sourceToTarget(organizations, OrganizationDTO.class));
-//    }
-    return null;
+  public List<OrganizationDTO> getMyOrganizations(
+      boolean isPtTenantAdmin, String tenantId, String currentUserId) {
+    if (isPtTenantAdmin) {
+      return findOrganizationTree(tenantId);
+    } else {
+      Set<String> organizationIds =
+          userOrganizationMappingMapper
+              .selectList(
+                  new QueryWrapper<UserOrganizationMapping>()
+                      .lambda()
+                      .in(UserOrganizationMapping::getUserId, currentUserId))
+              .stream()
+              .map(UserOrganizationMapping::getOrganizationId)
+              .collect(Collectors.toSet());
+      List<Organization> organizations =
+          baseMapper.selectList(
+              new QueryWrapper<Organization>()
+                  .lambda()
+                  .eq(Organization::getTenantId, tenantId)
+                  .in(organizationIds.size() > 0, Organization::getId, organizationIds));
+      return TreeUtils.buildTree(ReflectUtils.sourceToTarget(organizations, OrganizationDTO.class));
+    }
   }
 
   private List<OrganizationDTO> findOrganizationTree(String tenantId) {
@@ -193,46 +187,43 @@ public class YtOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
   @Override
   @Transactional
-  public void bindUserToOrganization(String userId, String[] organizationIds) {
-//    User user = userMapper.selectById(userId);
-//    if (user == null) {
-//      throw new DataValidationException("所选用户不存在");
-//    }
-//    if (!user.getTenantId().equals(getCurrentUser().getTenantId())) {
-//      throw new DataValidationException("所选用户不可用");
-//    }
-//    if (null != organizationIds && organizationIds.length > 0) {
-//      Set<String> newBinding =
-//          baseMapper
-//              .findOrganizationTreeList(
-//                  getCurrentUser().getTenantId(), Arrays.asList(organizationIds))
-//              .stream()
-//              .map(OrganizationDTO::getId)
-//              .collect(Collectors.toSet());
-//      Set<String> existBinding =
-//          userOrganizationMappingMapper
-//              .selectList(
-//                  new QueryWrapper<UserOrganizationMapping>()
-//                      .lambda()
-//                      .eq(UserOrganizationMapping::getUserId, userId))
-//              .stream()
-//              .map(UserOrganizationMapping::getOrganizationId)
-//              .collect(Collectors.toSet());
-//      Set<String> toDel = Sets.difference(existBinding, newBinding);
-//      Set<String> toAdd = Sets.difference(newBinding, existBinding);
-//      if (!toDel.isEmpty()) {
-//        userOrganizationMappingMapper.delete(
-//            new QueryWrapper<UserOrganizationMapping>()
-//                .lambda()
-//                .in(UserOrganizationMapping::getUserId, userId)
-//                .in(UserOrganizationMapping::getOrganizationId, toDel));
-//      }
-//      if (!toAdd.isEmpty()) {
-//        toAdd.stream()
-//            .map(organizationId -> new UserOrganizationMapping(userId, organizationId))
-//            .forEach(userOrganizationMappingMapper::insert);
-//      }
-//    }
+  public void bindUserToOrganization(String tenantId, String userId, String[] organizationIds) {
+    User user = userMapper.selectById(userId);
+    if (user == null) {
+      throw new YtDataValidationException("所选用户不存在");
+    }
+    if (!user.getTenantId().equals(tenantId)) {
+      throw new YtDataValidationException("所选用户不可用");
+    }
+    if (null != organizationIds && organizationIds.length > 0) {
+      Set<String> newBinding =
+          baseMapper.findOrganizationTreeList(tenantId, Arrays.asList(organizationIds)).stream()
+              .map(OrganizationDTO::getId)
+              .collect(Collectors.toSet());
+      Set<String> existBinding =
+          userOrganizationMappingMapper
+              .selectList(
+                  new QueryWrapper<UserOrganizationMapping>()
+                      .lambda()
+                      .eq(UserOrganizationMapping::getUserId, userId))
+              .stream()
+              .map(UserOrganizationMapping::getOrganizationId)
+              .collect(Collectors.toSet());
+      Set<String> toDel = Sets.difference(existBinding, newBinding);
+      Set<String> toAdd = Sets.difference(newBinding, existBinding);
+      if (!toDel.isEmpty()) {
+        userOrganizationMappingMapper.delete(
+            new QueryWrapper<UserOrganizationMapping>()
+                .lambda()
+                .in(UserOrganizationMapping::getUserId, userId)
+                .in(UserOrganizationMapping::getOrganizationId, toDel));
+      }
+      if (!toAdd.isEmpty()) {
+        toAdd.stream()
+            .map(organizationId -> new UserOrganizationMapping(userId, organizationId))
+            .forEach(userOrganizationMappingMapper::insert);
+      }
+    }
   }
 
   @Override

@@ -63,8 +63,6 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
-  /** 默认密码 */
-  private static final String DEFAULT_PWD = "123456";
 
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username) {
@@ -98,7 +96,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
       // 添加的租户管理员
       if (StringUtils.isNotBlank(userDTO.getTenantId())) {
         user.setTenantId(userDTO.getTenantId());
-        user.setPassword(passwordEncoder.encode(DEFAULT_PWD));
+        user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
         int tenantExist =
             tenantMapper.selectCount(
                 new QueryWrapper<Tenant>()
@@ -142,7 +140,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
         userRoleMapper.insert(userRole);
       }
       // 绑定用户和组织的关系
-      groupService.bindUserToOrganization(user.getId(), userDTO.getOrganizationIds());
+      groupService.bindUserToOrganization(tenantId,user.getId(), userDTO.getOrganizationIds());
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
       return userDTO;
     }
@@ -352,7 +350,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
     validatePhoneNumberAndEmail(userDTO);
     User user = new User();
     userDTO.copyToEntity(user, ID, PASSWORD, CREATE_TIME, UPDATE_TIME, ACTIVATE_TOKEN);
-    user.setPassword(passwordEncoder.encode(DEFAULT_PWD));
+    user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
     List<User> users =
         baseMapper.selectList(
             new QueryWrapper<User>().lambda().eq(User::getUsername, userDTO.getUsername()));

 package org.thingsboard.server.dao.yunteng.service;
-
-
-
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 
@@ -13,11 +10,12 @@ public interface YtOrganizationService {
 
   boolean deleteOrganizations(DeleteDTO deleteDTO,String tenantId);
 
-  List<OrganizationDTO> getMyOrganizations();
+  List<OrganizationDTO> getMyOrganizations(
+          boolean isPtTenantAdmin, String tenantId, String currentUserId);
 
-  OrganizationDTO updateOrganization(OrganizationDTO organizationDTO);
+  OrganizationDTO updateOrganization(OrganizationDTO organizationDTO, String tenantId);
 
-  void bindUserToOrganization(String userId, String[] organizationIds);
+  void bindUserToOrganization(String tenantId, String userId, String[] organizationIds);
 
   void unBindUserToOrganization(Set<String> userIds);
 }

@@ -34,6 +34,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="accountExpireTime" column="account_expire_time"/>
         <result property="level" column="level"/>
+        <result property="tbUser" column="tb_user"/>
     </resultMap>
 
     <sql id="columns">
@@ -50,7 +51,8 @@
         su.update_time AS update_time,
         su.real_name AS real_name,
         su.dept_id AS dept_id,
-        su.level AS level
+        su.level AS level,
+        su.tb_user AS tb_user
     </sql>
 
     <select id="findUserDetailsByUserName" resultMap="userDetailsMap">