Browse Source

根据prod报错修复部分问题

MaiXinRong 2 năm trước cách đây
mục cha
commit
de5fb6bb55
2 tập tin đã thay đổi với 6 bổ sung6 xóa
  1. 2 2
      app/service/stage_pay.js
  2. 4 4
      app/service/tender_cache.js

+ 2 - 2
app/service/stage_pay.js

@@ -297,9 +297,9 @@ module.exports = app => {
             if (!stage || !transaction || !times || order === undefined) {
                 throw '数据错误';
             }
-            const sql = 'INSERT INTO ?? (`tid`, `sid`, `pid`, `stimes`, `sorder`, `name`, `tp`, `expr`, `pause`,' +
+            const sql = 'INSERT INTO ?? (`tid`, `sid`, `pid`, `stimes`, `sorder`, `porder`, `name`, `tp`, `expr`, `pause`,' +
                         '    `pre_tp`, `end_tp`, `pre_used`, `pre_finish`, `start_stage_order`, `postil`) ' +
-                        '  SELECT SP.`tid`, SP.`sid`, SP.`pid`, ?, ?, SP.name, SP.`tp`, SP.`expr`, SP.`pause`,' +
+                        '  SELECT SP.`tid`, SP.`sid`, SP.`pid`, ?, ?, SP.`porder`, SP.name, SP.`tp`, SP.`expr`, SP.`pause`,' +
                         '     SP.`pre_tp`, SP.`end_tp`, SP.`pre_used`, SP.`pre_finish`, SP.`start_stage_order`, SP.`postil` ' +
                         '  FROM ?? As SP' +
                         '  WHERE SP.`sid` = ? AND SP.`stimes` = ? AND SP.`sorder` = ?';

+ 4 - 4
app/service/tender_cache.js

@@ -34,7 +34,7 @@ module.exports = app => {
             if (!cache.stage_count || (cache.stage_count === 1 && cache.stage_status === auditConst.stage.status.uncheck && cache.stage_flow_cur_uid !== uid)) {
                 tender.cur_flow = JSON.parse(cache.ledger_flow_cur_info || cache.ledger_flow_pre_info);
                 tender.cur_flow.title = '台账';
-                tender.pre_flow = cache.ledger_flow_pre_info ? JSON.parse(cache.ledger_flow_pre_info) : null;
+                tender.pre_flow = cache.ledger_flow_pre_info ? JSON.parse(cache.ledger_flow_pre_info) : {};
                 tender.stage_tp = {};
                 tender.progress = {
                     title: '台账',
@@ -48,7 +48,7 @@ module.exports = app => {
                 tender.cur_flow = cache.stage_status === auditConst.stage.status.checkNo
                     ? JSON.parse(cache.stage_flow_pre_info)
                     : JSON.parse(cache.stage_flow_cur_info || cache.stage_flow_pre_info);
-                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : null;
+                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : {};
                 tender.stage_tp = JSON.parse(cache.stage_flow_cur_tp || cache.stage_flow_pre_tp);
                 tender.progress = {
                     title: `第${cache.stage_count}期`,
@@ -61,8 +61,8 @@ module.exports = app => {
                 tender.stage_complete_count = tender.stage_complete_count;
                 tender.cur_flow = (cache.stage_status !== auditConst.stage.status.uncheck || cache.stage_flow_cur_uid !== uid)
                     ? JSON.parse(cache.stage_flow_pre_info) : JSON.parse(cache.stage_flow_cur_info || cache.stage_flow_pre_info);
-                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : null;
-                tender.stage_tp = JSON.parse(cache.stage_flow_cur_tp || cache.stage_flow_pre_tp);
+                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : {};
+                tender.stage_tp = cache.stage_flow_pre_tp ? JSON.parse(cache.stage_flow_pre_tp) : {};
                 tender.progress = {
                     title: `第${cache.stage_complete_count}期`,
                     status: auditConst.stage.tiStatusString[auditConst.stage.status.checked],