fix: 修改账号管理员，用户通过组织查询的BUG

@@ -92,6 +92,7 @@ public class YtUserController extends BaseController {
       @RequestParam(value = "realName", required = false) String realName,
       @RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "tenantId", required = false) String tenantId,
+      @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "roleType", required = false) RoleEnum roleType,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
@@ -107,16 +108,18 @@ public class YtUserController extends BaseController {
     } else {
       tenantId = getCurrentUser().getCurrentTenantId();
     }
+    if(organizationId != null){
+      queryMap.put("organizationId",organizationId);
+    }
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
+    queryMap.put("currentUserId", getCurrentUser().getCurrentUserId());
     queryMap.put("tenantId", tenantId);
     return userService.page(
         queryMap,
         getCurrentUser().isPtSysadmin(),
-        getCurrentUser().isPtAdmin(),
-        getCurrentUser().isPtTenantAdmin(),
-        tenantId);
+        getCurrentUser().isTenantAdmin());
   }
 
   @PutMapping

@@ -5,11 +5,15 @@ import java.util.regex.Pattern;
 public interface FastIotConstants {
 
   /** 默认密码 */
-  public static final String DEFAULT_PWD = "123456";
+  String DEFAULT_PWD = "123456";
 
   class DefaultOrder {
     public static final String CREATE_TIME="create_time";
   }
+  class MagicNumber{
+    public static final int ZERO = 0;
+    public static final int ONE = 1;
+  }
 
   String MOBILE =
       "^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$";

@@ -252,28 +252,33 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   public YtPageData<UserDTO> page(
       Map<String, Object> queryMap,
       boolean isPtSysadmin,
-      boolean isPlatformAdmin,
-      boolean isTenantAdmin,
-      String tenantId) {
-    IPage<UserDTO> userPage = new Page<>();
+      boolean isTenantAdmin) {
+    String tenantId = (String) queryMap.get("tenantId");
+    IPage<UserDTO> userPage = null;
     IPage<User> userIPage = getPage(queryMap, "create_time", true);
+    String organizationId = queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
+    List<String> userIds = null;
+    if(null != organizationId){
+      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,organizationId);
+      queryMap.put("userIds",userIds);
+    }
     if (isPtSysadmin) {
       String roleType = (String) queryMap.get("roleType");
-      if (StringUtils.isEmpty(roleType)) {
-        roleType = RoleEnum.PLATFORM_ADMIN.name();
-        userPage = baseMapper.getAdminUserPage(userIPage, tenantId, roleType);
-      } else {
+      if (!StringUtils.isEmpty(roleType)) {
         userPage = baseMapper.getTenantAdminPage(userIPage, tenantId);
+      } else {
+        if(null != organizationId && (userIds.size()==FastIotConstants.MagicNumber.ZERO)){
+          userPage = new Page<>();
+        }else{
+          userPage = baseMapper.getUserPage(userIPage, queryMap);
+        }
       }
-    } else if (isPlatformAdmin) {
-      // 平台管理员只能管理租户
-      userPage = baseMapper.selectAllTenantUser(userIPage);
     } else if (isTenantAdmin) {
-      Map<String, Object> map = new HashMap<>();
-      map.put("realName", queryMap.get("realName"));
-      map.put("username", queryMap.get("username"));
-      map.put("tenantId", tenantId);
-      userPage = baseMapper.getUserPage(userIPage, map);
+      if(null != organizationId && (userIds.size()==FastIotConstants.MagicNumber.ZERO)){
+        userPage = new Page<>();
+      }else{
+        userPage = baseMapper.getUserPage(userIPage, queryMap);
+      }
     }
     if (null != userPage) {
       userPage

@@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
@@ -17,4 +18,11 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
             IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 
     DeviceDTO selectDetail(@Param("tenantId") String tenantId,@Param("id") String id);
+
+    /**
+     * 通过客户的ID，查询改客户能查看的所有设备
+     * @param userId 客户ID
+     * @return 能查看的设备
+     */
+    List<DeviceDTO> getDeviceByCustomerUserId(@Param("userId") String userId);
 }

@@ -22,13 +22,8 @@ public interface UserMapper extends BaseMapper<User> {
 
   IPage<UserDTO> getUserPage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
 
-  IPage<UserDTO> getAdminUserPage(
-      IPage<?> page, @Param("tenantId") String tenantId, @Param("roleType") String roleType);
-
   IPage<UserDTO> getTenantAdminPage(IPage<?> page, @Param("tenantId") String tenantId);
 
-  IPage<UserDTO> selectAllTenantUser(IPage<?> page);
-
   Set<String> getAllIdsByTenantId(@Param("tenantIds") Collection<String> tenantIds);
 
   void setPassword2NullAndInsertActiveToken(

@@ -29,9 +29,7 @@ public interface YtUserService {
   YtPageData<UserDTO> page(
       Map<String, Object> queryMap,
       boolean isPtSysadmin,
-      boolean isPlatformAdmin,
-      boolean isTenantAdmin,
-      String tenantId);
+      boolean isTenantAdmin);
 
   UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId);
 

@@ -31,10 +31,13 @@
             <result property="name" column="organization_name"/>
         </association>
     </resultMap>
-    <sql id="columns">
+    <sql id="basicColumns">
         ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.device_token,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd,alarm_status
+    </sql>
+    <sql id="columns">
+        <include refid="basicColumns"/>
         ,ifdp.name AS profile_name,ifdp.transport_type
         ,io.name AS organization_name
     </sql>
@@ -89,4 +92,11 @@
 
         </where>
     </select>
+
+    <select id="getDeviceByCustomerUserId" resultMap="deviceMap">
+        SELECT <include refid="basicColumns"/> FROM iotfs_device ifd
+        WHERE ifd.organization_id IN
+              ( SELECT iuom.organization_id FROM iotfs_user_organization_mapping iuom
+                WHERE iuom.user_id = #{userId});
+    </select>
 </mapper>

@@ -85,6 +85,7 @@
         FROM sys_user su
         LEFT JOIN sys_tenant st ON su.tenant_id = st.tenant_id
         <where>
+            su.id != #{queryMap.currentUserId}
             <if test="queryMap.realName!=null and queryMap.realName!=''">
                 AND su.real_name LIKE CONCAT('%',#{queryMap.realName}::TEXT,'%')
             </if>
@@ -94,25 +95,15 @@
             <if test="queryMap.tenantId !=null and queryMap.tenantId!=''">
                 AND su.tenant_id=#{queryMap.tenantId}
             </if>
+            <if test="queryMap.userIds !=null">
+                AND su.id IN
+                <foreach collection="queryMap.userIds" item="userId" open="(" separator="," close=")">
+                    #{userId}
+                </foreach>
+            </if>
         </where>
     </select>
 
-    <select id="getAdminUserPage" resultMap="userDTOMap">
-        SELECT
-        <include refid="columns"/>,
-        st.name                AS tenant_name
-        FROM sys_user su
-                 LEFT JOIN sys_tenant st ON su.tenant_id = st.tenant_id
-        WHERE su.ID IN (SELECT user_id
-                        FROM sys_user_role
-                        WHERE role_id IN (SELECT ID
-                                          FROM sys_role
-                                          WHERE role_type = #{roleType}
-                                            <if test="roleType == 'PLATFORM_ADMIN'">
-                                                OR role_type = 'SYS_ADMIN'
-                                            </if>
-                                            AND tenant_id = #{tenantId}))
-    </select>
     <select id="getTenantAdminPage" resultMap="userDTOMap">
         SELECT
         <include refid="columns"/>,
@@ -121,14 +112,6 @@
         LEFT JOIN sys_tenant st ON su.tenant_id = st.tenant_id
         WHERE su.level = 2 AND su.tenant_id = #{tenantId}
     </select>
-    <select id="selectAllTenantUser" resultMap="userDTOMap">
-        SELECT
-        <include refid="columns"/>,
-        st.name                AS tenant_name
-        FROM sys_user su
-        LEFT JOIN sys_tenant st ON su.tenant_id = st.tenant_id
-        WHERE su.level = 2;
-    </select>
     <select id="getAllIdsByTenantId" resultType="java.lang.String">
         SELECT id FROM sys_user WHERE tenant_id IN
         <foreach collection="tenantIds" item="tenantId" open="(" separator="," close=")">