Browse Source

审批退回,消息问题

MaiXinRong 2 years ago
parent
commit
2c78121e3a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/service/stage_audit.js
  2. 1 1
      app/view/stage/modal.ejs

+ 1 - 1
app/service/stage_audit.js

@@ -1024,7 +1024,7 @@ module.exports = app => {
                 await this.ctx.helper.sendWechat(audit.aid, smsTypeConst.const.JL, smsTypeConst.judge.approval.toString(), wxConst.template.stage, wechatData);
 
                 // 上报/审批 - 检查三方特殊推送
-                await this.ctx.service.specMsg.addStageMsg(transaction, pid, this.ctx.stage, pushOperate.stage.flow);
+                await this.ctx.service.specMsg.addStageMsg(transaction, this.session.sessionProject.id, this.ctx.stage, pushOperate.stage.flow);
                 await transaction.commit();
                 // 通知发送 - 第三方更新
                 if (this.ctx.session.sessionProject.custom && syncApiConst.notice_type.indexOf(this.ctx.session.sessionProject.customType) !== -1) {

+ 1 - 1
app/view/stage/modal.ejs

@@ -477,7 +477,7 @@
                 <h5 class="modal-title">多人协同</h5>
             </div>
             <div class="modal-body">
-                <% if (stage.readOnly) { %>
+                <% if (!stage.readOnly) { %>
                     <div class="alert alert-warning">以下项目节及其子项被锁定,请输入密码解锁。</div>
                 <% } else { %>
                     <div class="alert alert-warning">以下项目节及其子项(灰色项)未确认审批。</div>