处理web登录默认租户不校验ip

byzs-module-system/src/main/java/cn/iocoder/byzs/module/system/service/auth/AdminAuthServiceImpl.java

@@ -142,8 +142,13 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     //判断是否需要校验验证码
     private void validateLongIp(AdminUserDO user) {
 
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (tenantId == null) {
+            tenantId = user.getTenantId();
+        }
+
         // 删除用户之前的所有令牌，实现单点登录（默认租户用户可以多设备登录）
-        if (!Objects.equals(TenantContextHolder.getTenantId(), WebFrameworkUtils.DEFAULT_TENANT_ID)){
+        if (!Objects.equals(tenantId, WebFrameworkUtils.DEFAULT_TENANT_ID)){
 
             //查看登录ip是否已被授权
             if (StringUtil.isNotBlank(user.getLoginIp()) && !IpUtil.isSameNetworkSegment(user.getLoginIp(), getClientIP())) {

byzs-web/src/main/java/cn/iocoder/byzs/module/web/controller/admin/ai/WebAiController.java

@@ -107,14 +107,6 @@ public class WebAiController {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         pageReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
         PageResult<AiChatRoleDO> pageResult = chatRoleService.getChatRoleMyPage(pageReqVO, getLoginUserId());
-
-        pageReqVO.setCategory("全部");
-        PageResult<AiChatRoleDO> pageResultAll = chatRoleService.getChatRoleMyPage(pageReqVO, getLoginUserId());
-        List<AiChatRoleDO> list = pageResult.getList();
-        list.addAll(pageResultAll.getList());
-        pageResult.setList(list);
-        pageResult.setTotal(pageResult.getTotal() + pageResultAll.getTotal());
-
         return success(BeanUtils.toBean(pageResult, WebAiChatRoleVO.class));
     }
 
@@ -337,4 +329,7 @@ public class WebAiController {
         }
         return success(BeanUtils.toBean(mapGame, MapGameRespVO.class));
     }
+
+
+
 }