From ca8aa294607459b15081a0cd15a840828b9a48f5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Nov 2022 16:25:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?dangerLevel=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcTripReportRecordDao.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
index e39f594606..7bff317ba3 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml
@@ -101,7 +101,7 @@
           </if>
           <choose>
               <when test='null != dangerLevel and dangerLevel != "" '>
-                  AND sojourn_history != #{dangerLevel}
+                  AND sojourn_history = #{dangerLevel}
               </when>
               <otherwise>
                   AND sojourn_history != '3'

From d327852db6f15baac5379573e0235fc6d9a390ad Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 4 Nov 2022 16:39:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?sql=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9EName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/govorg/CustomerAgencyDao.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
index 90f40009c2..262b5435d9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml
@@ -328,7 +328,7 @@
 
     <!-- 查询员工的证件号和手机号 -->
     <select id="getEmployeeRegisterMobileAndIdCard" resultType="java.util.Map">
-        select MOBILE,ID_CARD from ic_employee_register where id = #{registerId}
+        select MOBILE,ID_CARD,NAME from ic_employee_register where id = #{registerId}
     </select>
 
 </mapper>