From a48315e4098d32ab93f9a17f2b4fbf354544fd94 Mon Sep 17 00:00:00 2001 From: chenhao Date: Thu, 25 Dec 2025 14:58:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(inventory):=20=E7=A7=BB=E9=99=A4=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=86=85=E9=83=A8=E6=9F=A5=E8=AF=A2=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 从 OmsInventoryInnerMapper.xml 查询中移除 original_filename 字段 - 删除与 oms_file_log 表的冗余关联查询 - 更新 VueProjectOrderInfoController 中的权限控制逻辑 - 为 marketing_promotion 角色添加文件更新权限支持 --- .../ruoyi/sip/controller/vue/VueProjectOrderInfoController.java | 2 +- .../main/resources/mapper/inventory/OmsInventoryInnerMapper.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java index 5ff69cd9..5649c487 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java @@ -101,7 +101,7 @@ public class VueProjectOrderInfoController extends BaseController { boolean updateFlag = CollUtil.isNotEmpty(todoCompletedList) && ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus()) ? ("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName())) : (boolean) mmap.get("canUpdate"); - mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag); + mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")||ShiroUtils.getSubject().hasRole("marketing_promotion") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag); mmap.put("uploadFinalFile", (ShiroUtils.getSubject().hasRole("business") || ShiroUtils.getSysUser().isAdmin()) && ProjectOrderInfo.OrderStatus.APPROVE_COMPLETE.getCode().equals(projectOrderInfo.getOrderStatus())); mmap.put("todo", todoService.selectTodo(todo)); diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml index 637dfde5..3734eb11 100644 --- a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml @@ -27,13 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t1.purchase_no,t1.product_type,t1.order_code,t1.total_amount,t1.tax_rate,t1.tax_total, t2.warehouse_name, t3.user_name as create_by_name,t2.warehouse_type, t4.vendor_name,t5.model - ,t6.original_filename from oms_inventory_inner t1 left join oms_warehouse_info t2 on t1.warehouse_id = t2.id left join oms_vendor_info t4 on t1.vendor_code = t4.vendor_code left join sys_user t3 on t1.create_by = t3.user_id left join product_info t5 on t1.product_code = t5.product_code - left join oms_file_log t6 on t1.file_id=t6.id select t1.id, t1.inner_code, t1.product_code, t1.quantity, t1.warehouse_id, t1.create_by, t1.update_by, t1.create_time, t1.update_time ,t1.vendor_code