fix: 租户管理员修改失败的BUG,租户管理员修改时不调用TB,只有新增才调用

@@ -142,7 +142,8 @@ public class YtUserController extends BaseController {
       // 创建CUSTOMER_USER用户
       // 创建CUSTOMER_USER用户
       Customer customer = createCustomer(userDTO.getUsername());
       Customer customer = createCustomer(userDTO.getUsername());
       // 创建CUSTOMER_USER的管理员
       // 创建CUSTOMER_USER的管理员
-      User tbUser = createTBUser(userDTO,customer.getTenantId(),customer.getId(), Authority.CUSTOMER_USER);
+      User tbUser = new User();
+      tbUser = createTBUser(tbUser,userDTO,customer.getTenantId(),customer.getId(), Authority.CUSTOMER_USER);
       // 激活CUSTOMER_USER的管理员
       // 激活CUSTOMER_USER的管理员
       activeTBUser(tbUser.getId());
       activeTBUser(tbUser.getId());
     }
     }
@@ -167,9 +168,13 @@ public class YtUserController extends BaseController {
     try {
     try {
       // 创建TB的租户管理员
       // 创建TB的租户管理员
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
-      User tbUser = createTBUser(userDTO, tenantId,customerId, Authority.TENANT_ADMIN);
-      // 激活租户管理员
-      activeTBUser(tbUser.getId());
+      User tbUser = new User();
+      //只有新增才调用TB
+      if(null == userDTO.getId()){
+        tbUser = createTBUser(tbUser,userDTO, tenantId,customerId, Authority.TENANT_ADMIN);
+        // 激活租户管理员
+        activeTBUser(tbUser.getId());
+      }
     } catch (Exception e) {
     } catch (Exception e) {
       throw handleException(e);
       throw handleException(e);
     }
     }
@@ -316,10 +321,9 @@ public class YtUserController extends BaseController {
    * @return 用户
    * @return 用户
    * @throws ThingsboardException  tb运行异常
    * @throws ThingsboardException  tb运行异常
    */
    */
-  private User createTBUser(UserDTO userDTO, TenantId tenantId, CustomerId customerId, Authority authority)
+  private User createTBUser(User tbUser,UserDTO userDTO, TenantId tenantId, CustomerId customerId, Authority authority)
       throws ThingsboardException {
       throws ThingsboardException {
     try {
     try {
-      User tbUser = new User();
       tbUser.setAuthority(authority);
       tbUser.setAuthority(authority);
       tbUser.setTenantId(tenantId);
       tbUser.setTenantId(tenantId);
       tbUser.setCustomerId(customerId);
       tbUser.setCustomerId(customerId);

@@ -32,6 +32,7 @@ public enum ErrorMessage {
   USER_NAME_ALREADY_EXISTS(400013,"用户名已存在"),
   USER_NAME_ALREADY_EXISTS(400013,"用户名已存在"),
   DATA_ALREADY_EXISTS(400014,"数据已存在,无需重复添加"),
   DATA_ALREADY_EXISTS(400014,"数据已存在,无需重复添加"),
   USER_NOT_EXISTS(400015,"用户不存在"),
   USER_NOT_EXISTS(400015,"用户不存在"),
+  USERNAME_IS_IMMUTABLE(400016,"用户账号不可变"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -229,7 +229,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new NoneTenantAssetException("this user not belong to current tenant");
       throw new NoneTenantAssetException("this user not belong to current tenant");
     }
     }
     if (!user.getUsername().equals(userDTO.getUsername())) {
     if (!user.getUsername().equals(userDTO.getUsername())) {
-      throw new YtDataValidationException("username is immutable");
+      throw new YtDataValidationException(ErrorMessage.USERNAME_IS_IMMUTABLE.getMessage());
     }
     }
     validateUserNameAndPhoneNumberAndEmail(userDTO);
     validateUserNameAndPhoneNumberAndEmail(userDTO);
     user.setRealName(userDTO.getRealName());
     user.setRealName(userDTO.getRealName());
@@ -237,13 +237,15 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     user.setPhoneNumber(userDTO.getPhoneNumber());
     user.setPhoneNumber(userDTO.getPhoneNumber());
     user.setEmail(userDTO.getEmail());
     user.setEmail(userDTO.getEmail());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
-    if (!userDTO.getPassword().equals("******")) {
+    if (userDTO.getPassword() !=null && !userDTO.getPassword().equals("******")) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
     }
     }
     baseMapper.updateById(user);
     baseMapper.updateById(user);
-    deleteAndAddUserRole(user.getId(), Arrays.asList(userDTO.getRoleIds()));
-    userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
-        user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
+    if(null != userDTO.getRoleIds()){
+      deleteAndAddUserRole(user.getId(), Arrays.asList(userDTO.getRoleIds()));
+      userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
+              user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
+    }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
     return userDTO;
   }
   }