Browse Source

1.删除web端查询设备入参的租户id
2.调整web端登录 admin空指针问题

hxd 1 month ago
parent
commit
711e7f1345

+ 2 - 2
portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceListQueryReq.java

@@ -9,8 +9,8 @@ import java.time.LocalDate;
 @Data
 public class DeviceListQueryReq extends PageVo {
 
-    @Schema(description = "租户ID 为空则默认查全部设备,如果有对应值,则查询当前租户id下的所有设备")
-    private Long tenantId;
+//    @Schema(description = "租户ID 为空则默认查全部设备,如果有对应值,则查询当前租户id下的所有设备")
+//    private Long tenantId;
 
     @Schema(description = "设备ID")
     private String clientId;

+ 12 - 3
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -320,8 +320,12 @@ public class WebGatewayImpl implements WebGateway {
             saSession.set(UserConstants.SA_USER_NAME, adminUser.getUserName());
         }
 
-        // 查询用户所属小区信息
-        TblTenant tenant = tblTenantService.getById(adminUser.getTenantId());
+        // 查询用户所属小区信息(仅普通用户查询,超级管理员直接跳过)
+        TblTenant tenant = null;
+        if (adminUser.getTenantId() != null) {
+            tenant = tblTenantService.getById(adminUser.getTenantId());
+        }
+
 
         // 当前用户登录后,需要将当前用户的权限保存到redis,用于网关校验权限
         userAuthService.cacheRolesAndPermissions();
@@ -330,7 +334,12 @@ public class WebGatewayImpl implements WebGateway {
         AdminLoginRes res = CopyUtils.copy(tokenInfo, AdminLoginRes.class);
         BeanUtils.copyProperties(adminUser, res);
         res.setTenantId(adminUser.getTenantId());
-        res.setTenantName(tenant.getTenantName());
+        if (adminUser.getTenantId() == null) {
+            // 超级管理员
+            res.setTenantName("雷能生活");
+        } else {
+            res.setTenantName(tenant != null ? tenant.getTenantName() : null);
+        }
         log.info("当前用户account:{},登录成功", param.getAccount());
         return res;
     }

+ 3 - 3
portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -199,9 +199,9 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
         if (queryReq.getOnline() != null){
             queryWrapper.eq(DevInfo::getOnline, queryReq.getOnline());
         }
-        if (queryReq.getTenantId() != null){
-            queryWrapper.eq(DevInfo::getTenantId, queryReq.getTenantId());
-        }
+//        if (queryReq.getTenantId() != null){
+//            queryWrapper.eq(DevInfo::getTenantId, queryReq.getTenantId());
+//        }
         if (tenantId !=  null){
             queryWrapper.eq(DevInfo::getTenantId, tenantId);
         }