From 5df578ff69f6b02e821d59a8883bc75d78695a62 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 11:07:31 +0800
Subject: [PATCH] 2020-11-10

---
 src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
index 5fcad1d..006c55d 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyprint/index.jsx
@@ -47,10 +47,10 @@
 
   componentDidMount() {
     let _sql = `select PrintTempNO,Images,PrintTempNO+PrintTempName as PN from sPrintTemplate 
-    where appkey= @appkey@ and Deleted=0 
+    where appkey= @appkey@ and Deleted=0  and typechartwo=''
     union select ID,Images,a.PrintTempNO+PrintTempName as PN 
-    from (select * from sPrintTemplate where appkey= '' and Deleted=0 ) a 
-    left join (select PrintTempNO from sPrintTemplate where appkey= @appkey@ and Deleted=0 ) b 
+    from (select * from sPrintTemplate where appkey= '' and Deleted=0  and typechartwo='') a 
+    left join (select PrintTempNO from sPrintTemplate where appkey= @appkey@  and Deleted=0 ) b 
     on a.PrintTempNO=b.PrintTempNO 
     left join (select Srcid from sPrintTemplate_Log where appkey='' and apicode= @appkey@ and Deleted=0 ) c 
     on a.ID=c.Srcid where b.PrintTempNO is null and c.Srcid is null`
@@ -62,7 +62,7 @@
       arr_field: 'PN,PrintTempNO,Images'
     }
 
-    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
+    param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
     param.secretkey = Utils.encrypt(param.LText, param.timestamp)
 
     param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp) // 浜戠鏁版嵁楠岃瘉

--
Gitblit v1.8.0