From f8a76bedab9d6f93ee512ae76e8a8eed6c567939 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期四, 05 一月 2023 18:44:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/AdminInterceptor.java | 3 ++-
src/main/resources/mapper/WrkMastMapper.xml | 27 +++++++++++++++------------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 3932e07..3870f4f 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -24,6 +24,7 @@
import java.util.Date;
/**
+ * 鎷︽埅鍣�
* Created by vincent on 2019-06-13
*/
@Component
@@ -116,7 +117,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 01480d8..e12d484 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -101,18 +101,21 @@
</select>
<select id="selectPakoutOfStaNo" resultMap="BaseResultMap">
- select top 1 * from asr_wrk_mast where 1=1
- and crn_no = 2
- and wrk_sts in (11,12,13,14,15,16,17)
- and source_sta_no = #{staNo}
- and io_type in (101.103,104,107,110)
- union
- select top 1 * from asr_wrk_mast where 1=1
- and wrk_sts in (17,18)
- and io_type in (101.103,104,107,110)
- and wrk_no in (
- select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
- )
+ select top 1 * from (
+ select top 1 * from asr_wrk_mast where 1=1
+ and crn_no = 2
+ and wrk_sts in (11,12,13,14,15,16,17)
+ and source_sta_no = #{staNo}
+ and io_type in (101.103,104,107,110)
+ union
+ select top 1 * from asr_wrk_mast where 1=1
+ and wrk_sts in (17,18)
+ and io_type in (101.103,104,107,110)
+ and wrk_no in (
+ select wrk_no from asr_bas_devp where 1=1 and dev_no = #{staNo}
+ )
+ ) a
+
</select>
</mapper>
--
Gitblit v1.9.1