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 @@ + 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 = {};