Merge branch 'master' of http://192.168.1.25:3000/lbyzx123/huimv-employment

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/publicapi/PublicDraftController.java

@@ -0,0 +1,38 @@
+package com.huimv.employment.controller.publicapi;
+
+import com.huimv.employment.common.web.R;
+import com.huimv.employment.service.draft.DraftService;
+import com.huimv.employment.service.draft.dto.DraftDetailResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用工草稿公开查询（无需 JWT）。
+ * <p>路径不在 {@code /api/v1/mp/**} 下，JwtAuthFilter 不会拦截。</p>
+ */
+@RestController
+@RequestMapping("/api/v1/public/drafts")
+@Tag(name = "用工草稿（公开）", description = "无需登录，按小程序码 scene 查询草稿详情")
+public class PublicDraftController {
+
+    private final DraftService draftService;
+
+    public PublicDraftController(DraftService draftService) {
+        this.draftService = draftService;
+    }
+
+    @GetMapping
+    @Operation(summary = "公开查询用工草稿详情",
+            description = "无需 Authorization。scene 为小程序码参数（订单编号，与 fe_registration_batch.qr_token 一致）。"
+                    + "返回字段与登录态详情一致（含 fields、qr_code_url）。")
+    public R<DraftDetailResponse> getDetail(
+            @Parameter(description = "小程序码 scene / 订单编号", required = true, example = "ord_123")
+            @RequestParam("scene") String scene) {
+        return R.ok(draftService.getPublicDetailByScene(scene));
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/draft/DraftService.java

@@ -110,6 +110,37 @@ public class DraftService {
         return toDetail(draft, listFields(draftId));
     }
 
+    /**
+     * 公开查询草稿详情（无需登录）：按小程序码 scene（订单编号）定位订单 → 草稿。
+     */
+    public DraftDetailResponse getPublicDetailByScene(String scene) {
+        if (!StringUtils.hasText(scene)) {
+            throw new BizException(ErrorCode.BAD_REQUEST, "scene 不能为空");
+        }
+        String sceneValue = scene.trim();
+        FeEmploymentOrder order = feEmploymentOrderMapper.selectOne(new LambdaQueryWrapper<FeEmploymentOrder>()
+                .eq(FeEmploymentOrder::getOrderNo, sceneValue)
+                .orderByDesc(FeEmploymentOrder::getId)
+                .last("LIMIT 1"));
+        if (order == null) {
+            FeRegistrationBatch batch = feRegistrationBatchMapper.selectOne(new LambdaQueryWrapper<FeRegistrationBatch>()
+                    .eq(FeRegistrationBatch::getQrToken, sceneValue)
+                    .orderByDesc(FeRegistrationBatch::getId)
+                    .last("LIMIT 1"));
+            if (batch != null) {
+                order = feEmploymentOrderMapper.selectById(batch.getOrderId());
+            }
+        }
+        if (order == null || order.getDraftId() == null) {
+            throw new BizException(ErrorCode.NOT_FOUND, "未找到对应用工信息");
+        }
+        FeEmploymentDraft draft = feEmploymentDraftMapper.selectById(order.getDraftId());
+        if (draft == null) {
+            throw new BizException(ErrorCode.NOT_FOUND, "草稿不存在");
+        }
+        return toDetail(draft, listFields(draft.getId()));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public DraftDetailResponse update(Long userId, Long draftId, DraftUpdateRequest request) {
         FeEmploymentDraft draft = requireOwned(userId, draftId);

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/order/McpOrderService.java

@@ -76,9 +76,12 @@ public class McpOrderService {
 
         LambdaQueryWrapper<FeEmploymentOrder> wrapper = new LambdaQueryWrapper<FeEmploymentOrder>()
                 .eq(FeEmploymentOrder::getEnterpriseId, conversation.getEnterpriseId())
-                .eq(StringUtils.hasText(status), FeEmploymentOrder::getOrderStatus, status.trim())
                 .orderByDesc(FeEmploymentOrder::getCreateTime)
                 .last("LIMIT " + resolvedLimit);
+        // 注意：.eq(condition, column, value) 的 value 会先求值，status 为空时勿直接 status.trim()
+        if (StringUtils.hasText(status)) {
+            wrapper.eq(FeEmploymentOrder::getOrderStatus, status.trim());
+        }
 
         List<FeEmploymentOrder> orders = feEmploymentOrderMapper.selectList(wrapper);
         McpOrderListResponse response = new McpOrderListResponse();