fix(inventory): 移除库存内部查询中未使用的文件名字段
- 从 OmsInventoryInnerMapper.xml 查询中移除 original_filename 字段 - 删除与 oms_file_log 表的冗余关联查询 - 更新 VueProjectOrderInfoController 中的权限控制逻辑 - 为 marketing_promotion 角色添加文件更新权限支持master
parent
4f781c9f2b
commit
a48315e409
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -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
|
||||
</sql>
|
||||
<sql id="selectBaseInnerVo">
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue