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()));