From 5bf12507141b71e753dd91b687a5a84f481f8efa Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Tue, 19 Aug 2025 15:44:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(sip):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单编辑页面中，当关闭 iframe 时，重新显示保存和保存草稿按钮
- 更新订单编辑页面的权限控制逻辑，允许商务人员更新附件
- 修复订单创建时合作伙伴用户 ID 的获取逻辑，使用正确的系统用户 ID
---
 .../src/main/resources/templates/project/order/edit.html      | 4 ++++
 .../com/ruoyi/sip/controller/ProjectOrderInfoController.java  | 2 +-
 .../ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
index eccf3668..ccc624bb 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
@@ -731,6 +731,10 @@
                 parent.parent.$('.layui-layer-btn').show()
                 parent.parent.$('.saveDraft').show()
             },
+            cancel: function (index) {
+                parent.parent.$('.layui-layer-btn').show()
+                parent.parent.$('.saveDraft').show()
+            },
             end: function (index) {
                 // parent.parent.$('.layui-layer-btn').show()
                 // parent.parent.$('.saveDraft').show()
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
index fd994435..ad1cdcac 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java
@@ -206,7 +206,7 @@ public class ProjectOrderInfoController extends BaseController
         boolean updateFlag = CollUtil.isNotEmpty(todoCompletedList) ?
                 ("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName()))
                 : true;
-        mmap.put("updateFile", ShiroUtils.getSubject().hasRole("sale_assistant") && updateFlag);
+        mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")) && updateFlag);
         return prefix + "/edit";
     }
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 0fe2ee46..b38b08e2 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -367,7 +367,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
                 put("processTemplate", projectOrderInfo.getProcessTemplate());
                 put("applyUserName", ShiroUtils.getSysUser().getUserName());
                 put("applyUser", ShiroUtils.getUserId());
-                put("partnerUser", existProjectOrderInfo.getSystemUserId());
+                put("partnerUser",partnerInfos.get(0).getSystemUserId());
                 put("extendField1", projectOrderInfo.getVersionCode());
             }}, orderFlowKey);
             complete(null, null, getFlowBusinessKey(existProjectOrderInfo.getOrderCode(), projectOrderInfo.getProcessType()));