提交

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanController.java

@@ -37,7 +37,7 @@ public class InboundPlanController {
     @Operation(summary = "分页查询入库订单", description = "Required authority: " + OverseasPermissions.INBOUND_ORDER_LIST)
     public ApiResponse<PageResult<InboundPlanListResponse>> page(
         @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam String customerId,
+        @RequestParam(required = false) String customerId,
         @Valid InboundPlanRequests.Query query) {
         return ApiResponse.success(service.page(scope(user, customerId), query));
     }
@@ -111,10 +111,9 @@ public class InboundPlanController {
         }
         if ("PLATFORM".equals(user.appCode()) && user.tenantId() == 0L) {
             if (requestedCustomer == null || requestedCustomer.isBlank() || "0".equals(requestedCustomer)) {
-                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
-                    "Platform request must specify target tenant");
+                return null;
             }
-            return requestedCustomer;
+            return requestedCustomer.trim();
         }
         return String.valueOf(user.tenantId());
     }

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/mapper/InboundPlanQueryMapper.java

@@ -11,14 +11,15 @@ import java.util.List;
 @Mapper
 public interface InboundPlanQueryMapper {
     String FROM_AND_FILTER = " FROM ll_inbound_plan_line l" +
-        " JOIN ll_inbound_plan p ON p.id=l.plan_id AND p.customer_id=#{customerId}" +
-        " JOIN ll_order o ON o.id=l.order_id AND o.customer_id=#{customerId}" +
+        " JOIN ll_inbound_plan p ON p.id=l.plan_id" +
+        " JOIN ll_order o ON o.id=l.order_id" +
+        "<if test='customerId != null and customerId != \"\"'> AND p.customer_id=#{customerId} AND o.customer_id=#{customerId}</if>" +
         " LEFT JOIN ll_inbound_fba_appointment_item ai ON ai.line_id=l.id" +
         " AND ai.id=(SELECT ai2.id FROM ll_inbound_fba_appointment_item ai2" +
         " JOIN ll_inbound_fba_appointment a2 ON a2.id=ai2.appointment_id" +
-        " WHERE ai2.line_id=l.id AND a2.customer_id=#{customerId}" +
+        " WHERE ai2.line_id=l.id <if test='customerId != null and customerId != \"\"'> AND a2.customer_id=#{customerId}</if>" +
         " ORDER BY a2.created_at DESC,ai2.id DESC LIMIT 1)" +
-        " LEFT JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id AND a.customer_id=#{customerId}" +
+        " LEFT JOIN ll_inbound_fba_appointment a ON a.id=ai.appointment_id <if test='customerId != null and customerId != \"\"'> AND a.customer_id=#{customerId}</if>" +
         " WHERE 1=1" +
         "<if test='q.planNo != null and q.planNo != \"\"'> AND p.plan_no LIKE CONCAT('%',#{q.planNo},'%')</if>" +
         "<if test='q.inboundCode != null and q.inboundCode != \"\"'> AND l.inbound_code LIKE CONCAT('%',#{q.inboundCode},'%')</if>" +
@@ -29,8 +30,8 @@ public interface InboundPlanQueryMapper {
         "<if test='q.fbaWarehouseCode != null and q.fbaWarehouseCode != \"\"'> AND l.fba_warehouse_code LIKE CONCAT('%',#{q.fbaWarehouseCode},'%')</if>" +
         "<choose><when test='q.appointmentStatus == \"UNAPPOINTED\"'> AND ai.id IS NULL</when>" +
         "<when test='q.appointmentStatus != null and q.appointmentStatus != \"\"'> AND a.appointment_status=#{q.appointmentStatus}</when></choose>" +
-        "<choose><when test='q.dispatchStatus == \"SCHEDULED\"'> AND EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=#{customerId} AND di.order_id=l.order_id)</when>" +
-        "<when test='q.dispatchStatus == \"UNSCHEDULED\"'> AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=#{customerId} AND di.order_id=l.order_id)</when></choose>" +
+        "<choose><when test='q.dispatchStatus == \"SCHEDULED\"'> AND EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.order_id=l.order_id <if test='customerId != null and customerId != \"\"'> AND di.customer_id=#{customerId}</if>)</when>" +
+        "<when test='q.dispatchStatus == \"UNSCHEDULED\"'> AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.order_id=l.order_id <if test='customerId != null and customerId != \"\"'> AND di.customer_id=#{customerId}</if>)</when></choose>" +
         "<if test='q.createdFrom != null'> AND p.created_at &gt;=#{q.createdFrom}</if>" +
         "<if test='q.createdTo != null'> AND p.created_at &lt;=#{q.createdTo}</if>";
 

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundFbaAppointmentService.java

@@ -156,9 +156,10 @@ public class InboundFbaAppointmentService {
     }
 
     private InboundFbaAppointment find(String customerId, String appointmentNo) {
-        return appointmentMapper.selectOne(new LambdaQueryWrapper<InboundFbaAppointment>()
-            .eq(InboundFbaAppointment::getCustomerId, customerId)
-            .eq(InboundFbaAppointment::getAppointmentNo, appointmentNo));
+        LambdaQueryWrapper<InboundFbaAppointment> wrapper = new LambdaQueryWrapper<InboundFbaAppointment>()
+            .eq(InboundFbaAppointment::getAppointmentNo, appointmentNo);
+        if (customerId != null) wrapper.eq(InboundFbaAppointment::getCustomerId, customerId);
+        return appointmentMapper.selectOne(wrapper);
     }
 
     private List<InboundFbaAppointmentItem> items(Long appointmentId) {

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java

@@ -117,8 +117,10 @@ public class InboundPlanService {
 
     @Transactional(readOnly = true)
     public InboundPlanResponse detailByPlanNo(String customerId, String planNo) {
-        InboundPlan plan = planMapper.selectOne(new LambdaQueryWrapper<InboundPlan>()
-            .eq(InboundPlan::getCustomerId, customerId).eq(InboundPlan::getPlanNo, planNo));
+        LambdaQueryWrapper<InboundPlan> wrapper = new LambdaQueryWrapper<InboundPlan>()
+            .eq(InboundPlan::getPlanNo, planNo);
+        if (customerId != null) wrapper.eq(InboundPlan::getCustomerId, customerId);
+        InboundPlan plan = planMapper.selectOne(wrapper);
         if (plan == null) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inbound plan not found");
         }
@@ -244,7 +246,7 @@ public class InboundPlanService {
     }
 
     private InboundPlanResponse detail(String customerId, InboundPlan plan) {
-        if (!customerId.equals(plan.getCustomerId())) {
+        if (customerId != null && !customerId.equals(plan.getCustomerId())) {
             throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inbound plan not found");
         }
         List<InboundPlanLine> lines = lineMapper.selectList(new LambdaQueryWrapper<InboundPlanLine>()