房间使用情况查询

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebTenantGatewayImpl.java

@@ -68,7 +68,7 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
         } else {
 
             List<TblTenant> tenantList = tblTenantService.queryByCodeOrName(req.getTenantCode(), req.getTenantName());
-            if ((!CollectionUtils.isEmpty(tenantList) && tenantList.size() > 2) || !tenantList.get(0).getTenantId().equals(req.getTenantId())) {
+            if ((!CollectionUtils.isEmpty(tenantList) && ( ( tenantList.size() > 1) || !tenantList.get(0).getTenantId().equals(req.getTenantId())) )) {
                 throw new BizException(ErrorEnum.TENANT_IS_ALREADY_EXIST.getErrorCode(), ErrorEnum.TENANT_IS_ALREADY_EXIST.getErrorMessage());
             }
             // 更新租户

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -227,6 +227,7 @@ public class MqttSubHandle {
 
             // 针对跌倒事件 发送 网页 主题消息提示
             String tenantName = "";
+            // 网页告警提示 需要当前设备绑定到租户，会发送到当前租户已经登录的管理员页面
             if (dev.getTenantId() != null) {
                 TblTenant tblTenant = tblTenantService.getById(dev.getTenantId());
                 tenantName = tblTenant.getTenantName();

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/UserServiceImpl.java

@@ -65,7 +65,7 @@ public class UserServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> imple
         LambdaQueryWrapper<UserInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(UserInfo::getUserId, userId);
         queryWrapper.eq(UserInfo::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
-        return this.baseMapper.selectById(queryWrapper);
+        return this.baseMapper.selectOne(queryWrapper);
     }