Browse Source

fix: 变更令审核推送异常bug修复

lanjianrong 5 years atrás
parent
commit
27eadf4619
2 changed files with 243 additions and 252 deletions
  1. 231 220
      app/const/audit.js
  2. 12 32
      app/service/change.js

+ 231 - 220
app/const/audit.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 
 /**
  *
@@ -8,92 +8,92 @@
  * @version
  */
 // 台账审批流程
-const ledger = (function() {
+const ledger = (function () {
     const status = {
         uncheck: 1, // 待上报
         checking: 2, // 待审批|审批中
         checked: 3, // 审批通过
-        checkNo: 4, // 审批退回
-    };
+        checkNo: 4 // 审批退回
+    }
 
-    const statusString = [];
-    statusString[status.uncheck] = '';
-    statusString[status.checking] = '审批中';
-    statusString[status.checked] = '审批完成';
-    statusString[status.checkNo] = '审批退回';
+    const statusString = []
+    statusString[status.uncheck] = ''
+    statusString[status.checking] = '审批中'
+    statusString[status.checked] = '审批完成'
+    statusString[status.checkNo] = '审批退回'
 
-    const statusClass = [];
-    statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
-    statusClass[status.checked] = 'text-success';
-    statusClass[status.checkNo] = 'text-warning';
+    const statusClass = []
+    statusClass[status.uncheck] = ''
+    statusClass[status.checking] = ''
+    statusClass[status.checked] = 'text-success'
+    statusClass[status.checkNo] = 'text-warning'
 
     // 标段概况页
     // 描述文本
-    const auditString = [];
-    auditString[status.uncheck] = '';
-    auditString[status.checking] = '审批中';
-    auditString[status.checked] = '审批完成';
-    auditString[status.checkNo] = '审批退回';
+    const auditString = []
+    auditString[status.uncheck] = ''
+    auditString[status.checking] = '审批中'
+    auditString[status.checked] = '审批完成'
+    auditString[status.checkNo] = '审批退回'
     // 文字样式
-    const auditStringClass = [];
-    auditStringClass[status.uncheck] = '';
-    auditStringClass[status.checking] = 'text-warning';
-    auditStringClass[status.checked] = 'text-success';
-    auditStringClass[status.checkNo] = 'text-warning';
-    return { status, statusString, statusClass, auditString, auditStringClass };
-})();
+    const auditStringClass = []
+    auditStringClass[status.uncheck] = ''
+    auditStringClass[status.checking] = 'text-warning'
+    auditStringClass[status.checked] = 'text-success'
+    auditStringClass[status.checkNo] = 'text-warning'
+    return { status, statusString, statusClass, auditString, auditStringClass }
+})()
 
 // 台账修订 审批流程
-const revise = (function() {
+const revise = (function () {
     const status = {
         uncheck: 1, // 待上报
         checking: 2, // 待审批|审批中
         checked: 3, // 审批通过
-        checkNo: 4, // 审批退回
-    };
-    const statusString = [];
-    statusString[status.uncheck] = '草稿';
-    statusString[status.checking] = '审批中';
-    statusString[status.checked] = '完成';
-    statusString[status.checkNo] = '退回';
+        checkNo: 4 // 审批退回
+    }
+    const statusString = []
+    statusString[status.uncheck] = '草稿'
+    statusString[status.checking] = '审批中'
+    statusString[status.checked] = '完成'
+    statusString[status.checkNo] = '退回'
 
-    const statusClass = [];
-    statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
-    statusClass[status.checked] = 'text-success';
-    statusClass[status.checkNo] = 'text-warning';
+    const statusClass = []
+    statusClass[status.uncheck] = ''
+    statusClass[status.checking] = ''
+    statusClass[status.checked] = 'text-success'
+    statusClass[status.checkNo] = 'text-warning'
 
     // 标段概况页
     // 描述文本
-    const auditString = [];
-    auditString[status.uncheck] = '';
-    auditString[status.checking] = '审批中';
-    auditString[status.checked] = '审批完成';
-    auditString[status.checkNo] = '审批退回';
+    const auditString = []
+    auditString[status.uncheck] = ''
+    auditString[status.checking] = '审批中'
+    auditString[status.checked] = '审批完成'
+    auditString[status.checkNo] = '审批退回'
     // 文字样式
-    const auditStringClass = [];
-    auditStringClass[status.uncheck] = '';
-    auditStringClass[status.checking] = 'text-warning';
-    auditStringClass[status.checked] = 'text-success';
-    auditStringClass[status.checkNo] = 'text-warning';
+    const auditStringClass = []
+    auditStringClass[status.uncheck] = ''
+    auditStringClass[status.checking] = 'text-warning'
+    auditStringClass[status.checked] = 'text-success'
+    auditStringClass[status.checkNo] = 'text-warning'
     // 描述文本
-    const auditProgress = [];
-    auditProgress[status.uncheck] = '草稿';
-    auditProgress[status.checking] = '审批中';
-    auditProgress[status.checked] = '审批通过';
-    auditProgress[status.checkNo] = '审批退回';
+    const auditProgress = []
+    auditProgress[status.uncheck] = '草稿'
+    auditProgress[status.checking] = '审批中'
+    auditProgress[status.checked] = '审批通过'
+    auditProgress[status.checkNo] = '审批退回'
     // 样式
-    const auditProgressClass = [];
-    auditProgressClass[status.uncheck] = '';
-    auditProgressClass[status.checking] = 'text-warning';
-    auditProgressClass[status.checked] = 'text-success';
-    auditProgressClass[status.checkNo] = 'text-warning';
-    return { status, statusString, statusClass, auditString, auditStringClass, auditProgress, auditProgressClass };
-})();
+    const auditProgressClass = []
+    auditProgressClass[status.uncheck] = ''
+    auditProgressClass[status.checking] = 'text-warning'
+    auditProgressClass[status.checked] = 'text-success'
+    auditProgressClass[status.checkNo] = 'text-warning'
+    return { status, statusString, statusClass, auditString, auditStringClass, auditProgress, auditProgressClass }
+})()
 
 // 期审批流程
-const stage = (function() {
+const stage = (function () {
     // 流程状态
     const status = {
         uncheck: 1, // 待上报
@@ -101,92 +101,103 @@ const stage = (function() {
         checked: 3, // 审批通过
         checkNo: 4, // 审批退回原报
         checkNoPre: 5, // 审批退回上一人
-        checkAgain: 6, // 重新审批 // 该状态仅可用于,终审退回时,修改原终审的审批状态,并同时新增一条新的终审审批中记录
-    };
+        checkAgain: 6 // 重新审批 // 该状态仅可用于,终审退回时,修改原终审的审批状态,并同时新增一条新的终审审批中记录
+    }
 
     // 流程状态提示
-    const statusString = [];
-    statusString[status.uncheck] = '待上报';
-    statusString[status.checking] = '审批中';
-    statusString[status.checked] = '审批通过';
-    statusString[status.checkNo] = '审批退回';
-    statusString[status.checkNoPre] = '审批退回';
-    statusString[status.checkAgain] = '重新审批';
+    const statusString = []
+    statusString[status.uncheck] = '待上报'
+    statusString[status.checking] = '审批中'
+    statusString[status.checked] = '审批通过'
+    statusString[status.checkNo] = '审批退回'
+    statusString[status.checkNoPre] = '审批退回'
+    statusString[status.checkAgain] = '重新审批'
 
     // 流程状态样式
-    const statusClass = [];
-    statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
-    statusClass[status.checked] = 'text-success';
-    statusClass[status.checkNo] = 'text-warning';
-    statusClass[status.checkNoPre] = 'text-warning';
-    statusClass[status.checkAgain] = 'text-warning';
+    const statusClass = []
+    statusClass[status.uncheck] = ''
+    statusClass[status.checking] = ''
+    statusClass[status.checked] = 'text-success'
+    statusClass[status.checkNo] = 'text-warning'
+    statusClass[status.checkNoPre] = 'text-warning'
+    statusClass[status.checkAgain] = 'text-warning'
 
     /**
      * 期列表,审批状态一列
-      */
+     */
     // 按钮
-    const statusButton = [];
-    statusButton[status.uncheck] = '待上报';
-    statusButton[status.checking] = '审批';
-    statusButton[status.checked] = '';
-    statusButton[status.checkNo] = '重新上报';
-    statusButton[status.checkNoPre] = '重新审批';
-    statusButton[status.checkAgain] = '重新审批';
+    const statusButton = []
+    statusButton[status.uncheck] = '待上报'
+    statusButton[status.checking] = '审批'
+    statusButton[status.checked] = ''
+    statusButton[status.checkNo] = '重新上报'
+    statusButton[status.checkNoPre] = '重新审批'
+    statusButton[status.checkAgain] = '重新审批'
     // 按钮样式
-    const statusButtonClass = [];
-    statusButtonClass[status.uncheck] = 'btn-primary';
-    statusButtonClass[status.checking] = 'btn-success';
-    statusButtonClass[status.checked] = '';
-    statusButtonClass[status.checkNo] = 'btn-warning';
-    statusButtonClass[status.checkNoPre] = 'btn-warning';
-    statusButtonClass[status.checkAgain] = 'btn-warning';
+    const statusButtonClass = []
+    statusButtonClass[status.uncheck] = 'btn-primary'
+    statusButtonClass[status.checking] = 'btn-success'
+    statusButtonClass[status.checked] = ''
+    statusButtonClass[status.checkNo] = 'btn-warning'
+    statusButtonClass[status.checkNoPre] = 'btn-warning'
+    statusButtonClass[status.checkAgain] = 'btn-warning'
     // 描述文本
-    const auditString = [];
-    auditString[status.uncheck] = '';
-    auditString[status.checking] = '审批中';
-    auditString[status.checked] = '完成';
-    auditString[status.checkNo] = '退回';
-    auditString[status.checkNoPre] = '退回';
-    auditString[status.checkAgain] = '重新审批';
+    const auditString = []
+    auditString[status.uncheck] = ''
+    auditString[status.checking] = '审批中'
+    auditString[status.checked] = '完成'
+    auditString[status.checkNo] = '退回'
+    auditString[status.checkNoPre] = '退回'
+    auditString[status.checkAgain] = '重新审批'
     // 文字样式
-    const auditStringClass = [];
-    auditStringClass[status.uncheck] = '';
-    auditStringClass[status.checking] = 'text-warning';
-    auditStringClass[status.checked] = 'text-success';
-    auditStringClass[status.checkNo] = 'text-warning';
-    auditStringClass[status.checkNoPre] = 'text-warning';
-    auditStringClass[status.checkAgain] = 'text-warning';
+    const auditStringClass = []
+    auditStringClass[status.uncheck] = ''
+    auditStringClass[status.checking] = 'text-warning'
+    auditStringClass[status.checked] = 'text-success'
+    auditStringClass[status.checkNo] = 'text-warning'
+    auditStringClass[status.checkNoPre] = 'text-warning'
+    auditStringClass[status.checkAgain] = 'text-warning'
     /* ------------------------------------------------------- */
 
     /**
      * 期列表,审批进度一列
-    */
+     */
     // 描述文本
-    const auditProgress = [];
-    auditProgress[status.uncheck] = '待上报';
-    auditProgress[status.checking] = '审批中';
-    auditProgress[status.checked] = '审批通过';
-    auditProgress[status.checkNo] = '审批退回';
-    auditProgress[status.checkNoPre] = '审批退回';
-    auditProgress[status.checkAgain] = '重新审批';
+    const auditProgress = []
+    auditProgress[status.uncheck] = '待上报'
+    auditProgress[status.checking] = '审批中'
+    auditProgress[status.checked] = '审批通过'
+    auditProgress[status.checkNo] = '审批退回'
+    auditProgress[status.checkNoPre] = '审批退回'
+    auditProgress[status.checkAgain] = '重新审批'
     // 样式
-    const auditProgressClass = [];
-    auditProgressClass[status.uncheck] = '';
-    auditProgressClass[status.checking] = 'text-warning';
-    auditProgressClass[status.checked] = 'text-success';
-    auditProgressClass[status.checkNo] = 'text-warning';
-    auditProgressClass[status.checkNoPre] = 'text-warning';
-    auditProgressClass[status.checkAgain] = 'text-warning';
+    const auditProgressClass = []
+    auditProgressClass[status.uncheck] = ''
+    auditProgressClass[status.checking] = 'text-warning'
+    auditProgressClass[status.checked] = 'text-success'
+    auditProgressClass[status.checkNo] = 'text-warning'
+    auditProgressClass[status.checkNoPre] = 'text-warning'
+    auditProgressClass[status.checkAgain] = 'text-warning'
     /* ------------------------------------------------------- */
 
     const backType = {
         org: 1,
-        pre: 2,
-    };
-    return { status, statusString, statusClass, statusButton, statusButtonClass, auditString, auditStringClass, auditProgress, auditProgressClass, backType, timesLen: 100 };
-})();
-
+        pre: 2
+    }
+    return {
+        status,
+        statusString,
+        statusClass,
+        statusButton,
+        statusButtonClass,
+        auditString,
+        auditStringClass,
+        auditProgress,
+        auditProgressClass,
+        backType,
+        timesLen: 100
+    }
+})()
 
 // 变更令状态
 const status = {
@@ -195,39 +206,39 @@ const status = {
     checked: 3, // 审批完成
     // checkNo: 4,     // 审批终止
     back: 5, // 重新上报
-    backnew: 6, // 退回
-};
-const statusButton = [];
-statusButton[status.uncheck] = '上报';
-statusButton[status.checking] = '审批';
-statusButton[status.checked] = '';
+    backnew: 6 // 退回
+}
+const statusButton = []
+statusButton[status.uncheck] = '上报'
+statusButton[status.checking] = '审批'
+statusButton[status.checked] = ''
 // statusButton[status.checkNo] = '';
-statusButton[status.back] = '重新上报';
-statusButton[status.backnew] = '审批';
+statusButton[status.back] = '重新上报'
+statusButton[status.backnew] = '审批'
 
-const statusButtonClass = [];
-statusButtonClass[status.uncheck] = 'btn-primary';
-statusButtonClass[status.checking] = 'btn-success';
-statusButtonClass[status.checked] = '';
+const statusButtonClass = []
+statusButtonClass[status.uncheck] = 'btn-primary'
+statusButtonClass[status.checking] = 'btn-success'
+statusButtonClass[status.checked] = ''
 // statusButtonClass[status.checkNo] = '';
-statusButtonClass[status.back] = 'btn-warning';
-statusButtonClass[status.backnew] = 'btn-success';
+statusButtonClass[status.back] = 'btn-warning'
+statusButtonClass[status.backnew] = 'btn-success'
 
-const statusString = [];
-statusString[status.uncheck] = '';
-statusString[status.checking] = '审批中';
-statusString[status.checked] = '审批完成';
+const statusString = []
+statusString[status.uncheck] = ''
+statusString[status.checking] = '审批中'
+statusString[status.checked] = '审批完成'
 // statusString[status.checkNo] = '终止';
-statusString[status.back] = '审批退回';
-statusString[status.backnew] = '退回';
+statusString[status.back] = '审批退回'
+statusString[status.backnew] = '审批退回'
 
-const statusClass = [];
-statusClass[status.uncheck] = '';
-statusClass[status.checking] = 'text-warning';
-statusClass[status.checked] = 'text-success';
+const statusClass = []
+statusClass[status.uncheck] = ''
+statusClass[status.checking] = 'text-warning'
+statusClass[status.checked] = 'text-success'
 // statusClass[status.checkNo] = 'text-danger';
-statusClass[status.back] = 'text-warning';
-statusClass[status.backnew] = 'text-warning';
+statusClass[status.back] = 'text-warning'
+statusClass[status.backnew] = 'text-warning'
 
 /* ------------------------------------------------------- */
 
@@ -239,26 +250,26 @@ const auditStatus = {
     // checkNo: 4,     // 审批终止
     back: 5, // 退回到原报人重新上报
     backnew: 6, // 退回到上一个审批人
-    checkAgain: 7, // 重新审批
-};
+    checkAgain: 7 // 重新审批
+}
 
-const auditStatusString = [];
-auditStatusString[auditStatus.uncheck] = '待上报';
-auditStatusString[auditStatus.checking] = '审批中';
-auditStatusString[auditStatus.checked] = '审批通过';
+const auditStatusString = []
+auditStatusString[auditStatus.uncheck] = '待上报'
+auditStatusString[auditStatus.checking] = '审批中'
+auditStatusString[auditStatus.checked] = '审批通过'
 // auditStatusString[auditStatus.checkNo] = '审批终止';
-auditStatusString[auditStatus.back] = '退回';
-auditStatusString[auditStatus.backnew] = '审批退回';
-auditStatusString[auditStatus.checkAgain] = '重新审批';
+auditStatusString[auditStatus.back] = '退回'
+auditStatusString[auditStatus.backnew] = '审批退回'
+auditStatusString[auditStatus.checkAgain] = '重新审批'
 
-const auditStatusClass = [];
-auditStatusClass[auditStatus.uncheck] = '';
-auditStatusClass[auditStatus.checking] = 'text-warning';
-auditStatusClass[auditStatus.checked] = 'text-success';
+const auditStatusClass = []
+auditStatusClass[auditStatus.uncheck] = ''
+auditStatusClass[auditStatus.checking] = 'text-warning'
+auditStatusClass[auditStatus.checked] = 'text-success'
 // auditStatusClass[auditStatus.checkNo] = 'text-danger';
-auditStatusClass[auditStatus.back] = 'text-warning';
-auditStatusClass[auditStatus.backnew] = 'text-warning';
-auditStatusClass[auditStatus.checkAgain] = 'text-warning';
+auditStatusClass[auditStatus.back] = 'text-warning'
+auditStatusClass[auditStatus.backnew] = 'text-warning'
+auditStatusClass[auditStatus.checkAgain] = 'text-warning'
 
 /* ------------------------------------------------------- */
 
@@ -267,73 +278,73 @@ const filter = {
         pending: 1,
         uncheck: 5,
         checking: 2,
-        checked: 3,
+        checked: 3
         // checkNo: 4,
     },
-    statusString: [],
-};
-filter.statusString[filter.status.pending] = '待处理';
-filter.statusString[filter.status.uncheck] = '待上报';
-filter.statusString[filter.status.checking] = '进行中';
-filter.statusString[filter.status.checked] = '已完成';
+    statusString: []
+}
+filter.statusString[filter.status.pending] = '待处理'
+filter.statusString[filter.status.uncheck] = '待上报'
+filter.statusString[filter.status.checking] = '进行中'
+filter.statusString[filter.status.checked] = '已完成'
 // filter.statusString[filter.status.checkNo] = '终止';
 
 // 材料调差审批流程
-const material = (function() {
+const material = (function () {
     const status = {
         uncheck: 1, // 待上报
         checking: 2, // 待审批|审批中
         checked: 3, // 审批通过
         checkNo: 4, // 审批退回原报
         checkNoPre: 5, // 审批退回上一人
-        checkAgain: 6, // 终审退回  --该状态仅可用于,终审退回时,修改原终审的审批状态,并同时新增一条新的终审审批中记录
-    };
+        checkAgain: 6 // 终审退回  --该状态仅可用于,终审退回时,修改原终审的审批状态,并同时新增一条新的终审审批中记录
+    }
     // 流程状态提示
-    const statusString = [];
-    statusString[status.uncheck] = '待上报';
-    statusString[status.checking] = '审批中';
-    statusString[status.checked] = '审批通过';
-    statusString[status.checkNo] = '审批退回';
-    statusString[status.checkNoPre] = '审批退回';
-    statusString[status.checkAgain] = '重新审批';
+    const statusString = []
+    statusString[status.uncheck] = '待上报'
+    statusString[status.checking] = '审批中'
+    statusString[status.checked] = '审批通过'
+    statusString[status.checkNo] = '审批退回'
+    statusString[status.checkNoPre] = '审批退回'
+    statusString[status.checkAgain] = '重新审批'
 
     // 流程状态样式
-    const statusClass = [];
-    statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
-    statusClass[status.checked] = 'text-success';
-    statusClass[status.checkNo] = 'text-warning';
-    statusClass[status.checkNoPre] = 'text-warning';
-    statusClass[status.checkAgain] = 'text-warning';
+    const statusClass = []
+    statusClass[status.uncheck] = ''
+    statusClass[status.checking] = ''
+    statusClass[status.checked] = 'text-success'
+    statusClass[status.checkNo] = 'text-warning'
+    statusClass[status.checkNoPre] = 'text-warning'
+    statusClass[status.checkAgain] = 'text-warning'
 
     // 按钮
-    const statusButton = [];
-    statusButton[status.uncheck] = '待上报';
-    statusButton[status.checking] = '审批';
-    statusButton[status.checked] = '';
-    statusButton[status.checkNo] = '重新上报';
+    const statusButton = []
+    statusButton[status.uncheck] = '待上报'
+    statusButton[status.checking] = '审批'
+    statusButton[status.checked] = ''
+    statusButton[status.checkNo] = '重新上报'
 
     // 按钮样式
-    const statusButtonClass = [];
-    statusButtonClass[status.uncheck] = 'btn-primary';
-    statusButtonClass[status.checking] = 'btn-success';
-    statusButtonClass[status.checked] = '';
-    statusButtonClass[status.checkNo] = 'btn-warning';
+    const statusButtonClass = []
+    statusButtonClass[status.uncheck] = 'btn-primary'
+    statusButtonClass[status.checking] = 'btn-success'
+    statusButtonClass[status.checked] = ''
+    statusButtonClass[status.checkNo] = 'btn-warning'
 
     // 描述文本
-    const auditProgress = [];
-    auditProgress[status.uncheck] = '待上报';
-    auditProgress[status.checking] = '审批中';
-    auditProgress[status.checked] = '审批通过';
-    auditProgress[status.checkNo] = '审批退回';
+    const auditProgress = []
+    auditProgress[status.uncheck] = '待上报'
+    auditProgress[status.checking] = '审批中'
+    auditProgress[status.checked] = '审批通过'
+    auditProgress[status.checkNo] = '审批退回'
     // 样式
-    const auditProgressClass = [];
-    auditProgressClass[status.uncheck] = '';
-    auditProgressClass[status.checking] = 'text-warning';
-    auditProgressClass[status.checked] = 'text-success';
-    auditProgressClass[status.checkNo] = 'text-warning';
-    return { status, statusString, statusClass, statusButton, statusButtonClass, auditProgress, auditProgressClass };
-})();
+    const auditProgressClass = []
+    auditProgressClass[status.uncheck] = ''
+    auditProgressClass[status.checking] = 'text-warning'
+    auditProgressClass[status.checked] = 'text-success'
+    auditProgressClass[status.checkNo] = 'text-warning'
+    return { status, statusString, statusClass, statusButton, statusButtonClass, auditProgress, auditProgressClass }
+})()
 
 // 推送类型
 const pushType = {
@@ -341,8 +352,8 @@ const pushType = {
     stage: 2,
     change: 3,
     revise: 4,
-    ledger: 5,
-};
+    ledger: 5
+}
 
 module.exports = {
     ledger,
@@ -357,8 +368,8 @@ module.exports = {
         statusClass,
         auditStatus,
         auditStatusString,
-        auditStatusClass,
+        auditStatusClass
     },
     filter,
-    pushType,
-};
+    pushType
+}

+ 12 - 32
app/service/change.js

@@ -565,22 +565,16 @@ module.exports = app => {
             try {
                 // 获取所有审核人列表
                 const auditors = await this.ctx.service.changeAudit.getAllAuditors(changeData.tid)
+                console.log('auditors', auditors)
+                console.log('postData', postData)
                 // 添加到消息推送表
                 const noticeContent = await this.getNoticeContent(
                     pid,
                     changeData.tid,
                     changeData.cid,
-                    postData.audit_id
+                    this.ctx.session.sessionUser.accountId
                 )
-                const records = [
-                    {
-                        pid,
-                        type: pushType.change,
-                        uid: changeData.uid,
-                        status: audit.flow.status.checked,
-                        content: noticeContent
-                    }
-                ]
+                const records = []
                 auditors.forEach(auditor => {
                     records.push({
                         pid,
@@ -788,17 +782,9 @@ module.exports = app => {
                     pid,
                     changeData.tid,
                     changeData.cid,
-                    postData.audit_id
+                    this.ctx.session.sessionUser.accountId
                 )
-                const records = [
-                    {
-                        pid,
-                        type: pushType.change,
-                        uid: changeData.uid,
-                        status: audit.flow.status.backnew,
-                        content: noticeContent
-                    }
-                ]
+                const records = []
                 auditors.forEach(auditor => {
                     records.push({
                         pid,
@@ -933,17 +919,9 @@ module.exports = app => {
                     pid,
                     changeData.tid,
                     changeData.cid,
-                    postData.audit_id
+                    this.ctx.session.sessionUser.accountId
                 )
-                const records = [
-                    {
-                        pid,
-                        type: pushType.change,
-                        uid: changeData.uid,
-                        status: audit.flow.status.back,
-                        content: noticeContent
-                    }
-                ]
+                const records = []
                 auditors.forEach(auditor => {
                     records.push({
                         pid,
@@ -1428,14 +1406,15 @@ module.exports = app => {
          * @param {Number} pid 项目id
          * @param {Number} tid 台账id
          * @param {Number} cid 变更id
+         * @param {Number} uid 审核人id
          */
-        async getNoticeContent(pid, tid, cid) {
+        async getNoticeContent(pid, tid, cid, uid) {
             const noticeSql =
                 'SELECT * FROM (SELECT ' +
                 '  t.`id` As `tid`, t.`name`, c.`cid`, c.`code` As `c_code`, pa.`name` As `su_name`, pa.role As `su_role`' +
                 '  FROM (SELECT * FROM ?? WHERE `id` = ? ) As t' +
                 '  LEFT JOIN ?? As c ON c.`cid` = ?' +
-                '  LEFT JOIN ?? As pa ON c.`uid` = pa.`id`' +
+                '  LEFT JOIN ?? As pa ON pa.`id` = ?' +
                 '  WHERE  t.`project_id` = ? ) as new_t GROUP BY new_t.`tid`'
             const noticeSqlParam = [
                 this.ctx.service.tender.tableName,
@@ -1443,6 +1422,7 @@ module.exports = app => {
                 this.ctx.service.change.tableName,
                 cid,
                 this.ctx.service.projectAccount.tableName,
+                uid,
                 pid
             ]
             const content = await this.db.query(noticeSql, noticeSqlParam)