fix: 租户下用户列表分页查询BUG，创建用户时应该使用用户输入的密码BUG

@@ -159,14 +159,14 @@ public class YtUserController extends BaseController {
           createTBUser(
           createTBUser(
               tbUser, userDTO, customer.getTenantId(), customer.getId(), Authority.CUSTOMER_USER);
               tbUser, userDTO, customer.getTenantId(), customer.getId(), Authority.CUSTOMER_USER);
       // 激活CUSTOMER_USER的管理员
       // 激活CUSTOMER_USER的管理员
-      activeTBUser(tbUser.getId());
+      activeTBUser(tbUser.getId(),userDTO.getPassword());
     }
     }
     return ResponseEntity.ok(
     return ResponseEntity.ok(
         userService.saveAccount(
         userService.saveAccount(
             userDTO,
             userDTO,
             sendEmail,
             sendEmail,
             sendMsg,
             sendMsg,
-            getCurrentUser().isPtSysadmin(),
+            getCurrentUser().isPtTenantAdmin(),
             getCurrentUser().getCurrentTenantId()));
             getCurrentUser().getCurrentTenantId()));
   }
   }
 
 
@@ -187,7 +187,7 @@ public class YtUserController extends BaseController {
       if (null == userDTO.getId()) {
       if (null == userDTO.getId()) {
         tbUser = createTBUser(tbUser, userDTO, tenantId, customerId, Authority.TENANT_ADMIN);
         tbUser = createTBUser(tbUser, userDTO, tenantId, customerId, Authority.TENANT_ADMIN);
         // 激活租户管理员
         // 激活租户管理员
-        activeTBUser(tbUser.getId());
+        activeTBUser(tbUser.getId(),FastIotConstants.DEFAULT_PWD);
       }
       }
     } catch (Exception e) {
     } catch (Exception e) {
       throw handleException(e);
       throw handleException(e);
@@ -325,7 +325,7 @@ public class YtUserController extends BaseController {
    * @param userId 用户ID
    * @param userId 用户ID
    * @throws ThingsboardException tb运行异常
    * @throws ThingsboardException tb运行异常
    */
    */
-  private void activeTBUser(UserId userId) throws ThingsboardException {
+  private void activeTBUser(UserId userId,String password) throws ThingsboardException {
     try {
     try {
       // 1、获取UserCredentials 并获取activateToken
       // 1、获取UserCredentials 并获取activateToken
       User user = checkUserId(userId, Operation.READ);
       User user = checkUserId(userId, Operation.READ);
@@ -333,7 +333,7 @@ public class YtUserController extends BaseController {
       UserCredentials userCredentials =
       UserCredentials userCredentials =
           tbUserService.findUserCredentialsByUserId(authUser.getTenantId(), user.getId());
           tbUserService.findUserCredentialsByUserId(authUser.getTenantId(), user.getId());
       // 2、进行激活
       // 2、进行激活
-      String encodedPassword = passwordEncoder.encode(FastIotConstants.DEFAULT_PWD);
+      String encodedPassword = passwordEncoder.encode(password);
       UserCredentials credentials =
       UserCredentials credentials =
           tbUserService.activateUserCredentials(
           tbUserService.activateUserCredentials(
               TenantId.SYS_TENANT_ID, userCredentials.getActivateToken(), encodedPassword);
               TenantId.SYS_TENANT_ID, userCredentials.getActivateToken(), encodedPassword);

@@ -92,6 +92,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     boolean userExist;
     boolean userExist;
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
     if (StringUtils.isNotBlank(userDTO.getPassword())) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
+    }else {
+      user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
     }
     }
     userExist =
     userExist =
         baseMapper.selectCount(
         baseMapper.selectCount(
@@ -103,7 +105,6 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     if (userExist) {
     if (userExist) {
       throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
       throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
     } else {
     } else {
-      user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
       user.setTenantId(tenantId);
       user.setTenantId(tenantId);
       user.setLevel(
       user.setLevel(
           isTenantAdminOperate
           isTenantAdminOperate
@@ -314,6 +315,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
         userPage = new Page<>();
         userPage = new Page<>();
       } else {
       } else {
+        queryMap.put("isTenantAdmin",true);
         userPage = baseMapper.getUserPage(userIPage, queryMap);
         userPage = baseMapper.getUserPage(userIPage, queryMap);
       }
       }
     }
     }

@@ -99,6 +99,9 @@
             <if test="queryMap.tenantId !=null and queryMap.tenantId!=''">
             <if test="queryMap.tenantId !=null and queryMap.tenantId!=''">
                 AND su.tenant_id=#{queryMap.tenantId}
                 AND su.tenant_id=#{queryMap.tenantId}
             </if>
             </if>
+            <if test="queryMap.isTenantAdmin != null">
+                AND su.level =3
+            </if>
             <if test="queryMap.userIds !=null">
             <if test="queryMap.userIds !=null">
                 AND su.id IN
                 AND su.id IN
                 <foreach collection="queryMap.userIds" item="userId" open="(" separator="," close=")">
                 <foreach collection="queryMap.userIds" item="userId" open="(" separator="," close=")">