From 9b89675ef4694025d194c0ddfd28548b93eab2d0 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Mon, 19 Feb 2024 09:09:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/business/DcTrafficIncidentsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml index 609545c7..85b1d003 100644 --- a/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcTrafficIncidentsMapper.xml @@ -226,7 +226,7 @@ else 0 end) minuteTime from dc_event t1 LEFT JOIN dc_event_traffic_control t2 on t1.id = t2.id - t1.event_type = '3' and t1.event_subclass = '3-2' + t1.event_type = '3' and t1.event_subclass = '3-2' and t2.control_type = #{controlType} AND t2.facility_id in From 469b242320b3e5c9c4d2e89e8c2adaa56651c45f Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Mon, 19 Feb 2024 11:04:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E7=AB=AFcookie?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/utils/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/utils/auth.js b/ruoyi-ui/src/utils/auth.js index 08a43d6e..234a0a7a 100644 --- a/ruoyi-ui/src/utils/auth.js +++ b/ruoyi-ui/src/utils/auth.js @@ -1,6 +1,6 @@ import Cookies from 'js-cookie' -const TokenKey = 'Admin-Token' +const TokenKey = 'DC-Token' export function getToken() { return Cookies.get(TokenKey)