MaiXinRong 5 лет назад
Родитель
Сommit
dcbf0c9058
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      app/view/stage/audit_modal.ejs
  2. 1 1
      sql/update.sql

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

@@ -1496,7 +1496,7 @@
     const dataChecker = DataChecker({
         checkUrl: '/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/check',
         errorList: $.cs_errorList({
-            storeKey: 'stage-error-' + stage.id,
+            storeKey: 'stage-error-' + <%- ctx.stage.id %>,
         }),
     });
 

+ 1 - 1
sql/update.sql

@@ -2,4 +2,4 @@ UPDATE `zh_stage_pay` sp
   LEFT JOIN `zh_stage` s ON sp.sid = s.id
   LEFT JOIN `zh_pay` p ON sp.pid = p.id
   SET sp.`pre_used` = 1
-  WHERE sp.`start_stage_order` < s.`order` AND sp.`pre_used` = 0 AND p.`ptype` = 1;
+  WHERE (sp.`start_stage_order` < s.`order` OR ((not IsNULL(sp.pre_tp)) AND sp.pre_tp) AND sp.`pre_used` = 0 AND p.`ptype` = 1;