From e3ea282568981814a28dced53fe350659b364baf Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Mon, 1 Sep 2025 10:44:05 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeBikeInfoController.java      |  2 +-
 .../com/cdzy/user/component/MyTenantFactory.java | 16 +++++++++-------
 .../cdzy/user/component/TenantInterceptor.java   |  7 -------
 .../com/cdzy/user/controller/AuthController.java |  3 +++
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
index d21c92b2..8c08114a 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
@@ -953,7 +953,7 @@ public class EbikeBikeInfoController {
      * @param dto 车辆id
      * @return 结果
      */
-    @GetMapping("getRegionIdsByBikes")
+    @PostMapping("getRegionIdsByBikes")
     JsonResult<?> getRegionIdsByBikes(@RequestBody ReqBatchRegionDto dto) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(EBIKE_BIKE_INFO.REGIN_ID)
diff --git a/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java b/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
index b03f6eb9..fbbd5b05 100644
--- a/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
+++ b/ebike-user/src/main/java/com/cdzy/user/component/MyTenantFactory.java
@@ -1,5 +1,6 @@
 package com.cdzy.user.component;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.mybatisflex.core.tenant.TenantFactory;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -7,13 +8,14 @@ import org.springframework.web.context.request.RequestContextHolder;
 public class MyTenantFactory implements TenantFactory {
 
     public Object[] getTenantIds() {
-        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
-        Object attribute = attributes.getAttribute("tenantId", RequestAttributes.SCOPE_REQUEST);
-        if (attribute != null) {
-            Long tenantId = Long.valueOf(attribute.toString());
-            return new Object[]{tenantId};
-        } else {
-            return new Object[]{};
+        if (StpUtil.isLogin()) {
+            RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+            Object attribute = attributes.getAttribute("tenantId", RequestAttributes.SCOPE_REQUEST);
+            if (attribute != null) {
+                Long tenantId = Long.valueOf(attribute.toString());
+                return new Object[]{tenantId};
+            }
         }
+        return null;
     }
 }
\ No newline at end of file
diff --git a/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java b/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
index c2d19bbf..0f91d496 100644
--- a/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
+++ b/ebike-user/src/main/java/com/cdzy/user/component/TenantInterceptor.java
@@ -30,11 +30,4 @@ public class TenantInterceptor implements HandlerInterceptor {
         StaffDto staffDto = (StaffDto) StpUtil.getSessionByLoginId(id).get(id);
         return staffDto.getOrgId();
     }
-
-//    List<Long> getAllTenantIdByReuqest(HttpServletRequest request) {
-//        String token = request.getHeader("Authorization");
-//        String id = (String) StpUtil.getLoginIdByToken(token);
-//        StaffDto staffDto = (StaffDto) StpUtil.getSessionByLoginId(id).get(id);
-//        return staffDto.getOrgId();
-//    }
 }
\ No newline at end of file
diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/AuthController.java b/ebike-user/src/main/java/com/cdzy/user/controller/AuthController.java
index da3138c5..8f883f53 100644
--- a/ebike-user/src/main/java/com/cdzy/user/controller/AuthController.java
+++ b/ebike-user/src/main/java/com/cdzy/user/controller/AuthController.java
@@ -12,6 +12,7 @@ import com.cdzy.user.service.PermissionsService;
 import com.cdzy.user.service.StaffService;
 import com.cdzy.user.utils.AESUtils;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.tenant.TenantManager;
 import jakarta.annotation.Resource;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,10 +49,12 @@ public class AuthController {
      * @param loginVo 道路信息
      * @return {@code 200} 添加成功，{@code 500} 添加失败
      */
+
     @PostMapping("loginByPwd")
     public JsonResult<?> loginByPwd(@RequestBody PwdLoginVo loginVo) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(STAFF.USERNAME.eq(loginVo.getUsername()));
+        TenantManager.ignoreTenantCondition();
         Staff staff = staffService.getOne(queryWrapper);
         if (staff == null) {
             return JsonResult.failed(Message.USERNAME_WRONG);