From c871f184d82085e017a38482e1272f7164e925f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <wangwenhao_2026@163.com>
Date: Fri, 29 May 2026 11:06:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(bid):=20=E4=BF=AE=E5=A4=8D=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=8A=A5=E4=BB=B7=E5=AF=B9=E6=AF=94=E5=92=8C=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7ID=E8=AE=BE=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 为新增物料添加租户ID自动设置逻辑，优先取部门ID，默认值为1
2. 调整报价对比页面初始化加载逻辑，移除空判断限制并优化空数组处理
3. 为供应商报价明细查询添加空值过滤，提升数据准确性
---
 .../web/controller/bid/BizMaterialController.java |  6 ++++++
 .../resources/mapper/bid/BizMaterialMapper.xml    |  3 +++
 .../bid/material/components/CompareSection.vue    | 15 ++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizMaterialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizMaterialController.java
index 17a4f4ae..50a1e49e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizMaterialController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizMaterialController.java
@@ -37,6 +37,12 @@ public class BizMaterialController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody BizMaterial record) {
         record.setCreateBy(getUsername());
+        // 设置租户ID：优先使用部门ID，否则使用默认值1
+        Long tenantId = getDeptId();
+        if (tenantId == null) {
+            tenantId = 1L;
+        }
+        record.setTenantId(tenantId);
         return toAjax(service.insertBizMaterial(record));
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/bid/BizMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BizMaterialMapper.xml
index 073bda8f..d04508e1 100644
--- a/ruoyi-system/src/main/resources/mapper/bid/BizMaterialMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/bid/BizMaterialMapper.xml
@@ -180,6 +180,7 @@
   </select>
 
   <!-- 根据物料ID列表获取各供应商的详细报价明细（用于对比展示） -->
+  <!-- 只通过 rfq_item_id -> material_id 精确关联，确保数据准确性 -->
   <select id="selectSupplierQuoteComparison" resultType="java.util.Map">
     SELECT
       ri.material_id,
@@ -200,6 +201,8 @@
     JOIN biz_rfq_item ri ON qi.rfq_item_id = ri.item_id
     WHERE ri.material_id IN
     <foreach collection="list" item="id" open="(" separator="," close=")">#{id}</foreach>
+      AND qi.unit_price IS NOT NULL
+      AND qi.rfq_item_id IS NOT NULL
     ORDER BY ri.material_id, qi.unit_price ASC, q.submit_time DESC
   </select>
 
diff --git a/ruoyi-ui/src/views/bid/material/components/CompareSection.vue b/ruoyi-ui/src/views/bid/material/components/CompareSection.vue
index 509ff63e..74df39ea 100644
--- a/ruoyi-ui/src/views/bid/material/components/CompareSection.vue
+++ b/ruoyi-ui/src/views/bid/material/components/CompareSection.vue
@@ -208,13 +208,11 @@ export default {
     async initLoad() {
       this.loadError = null;
       await this.loadSameNameMaterials();
-      if (this.sameNameMaterials.length) {
-        const allIds = this.sameNameMaterials.map(m => m.materialId);
-        this._loadingLock = true;
-        await this.loadQuoteComparison(allIds);
-        this.targetIds = allIds;
-        this._loadingLock = false;
-      }
+      const allIds = this.sameNameMaterials.map(m => m.materialId);
+      this._loadingLock = true;
+      await this.loadQuoteComparison(allIds);
+      this.targetIds = allIds;
+      this._loadingLock = false;
     },
 
     async loadSameNameMaterials() {
@@ -241,11 +239,10 @@ export default {
     },
 
     async loadQuoteComparison(materialIds) {
-      if (!materialIds || !materialIds.length) return;
       this.loadingQuote = true;
       this.loadError = null;
       try {
-        const ids = [Number(this.materialId), ...materialIds];
+        const ids = [Number(this.materialId), ...(materialIds || [])];
         const res = await getQuoteComparison(ids);
         const data = res.data || [];
         const map = {};