diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index ec451cc..fda3619 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -4,6 +4,6 @@ spring:
# - classpath:nacos.yml
# - classpath:sdk.yml
- classpath:nacos-prod.yml
-# - classpath:sdk-prod.yml
- - classpath:sdk-prod-gwj.yml
+ - classpath:sdk-prod.yml
+# - classpath:sdk-prod-gwj.yml
- classpath:swagger.yml
diff --git a/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java b/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
index 9798654..6398cad 100644
--- a/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
+++ b/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
@@ -56,6 +56,7 @@ public class BusCalendarController {
}
String decryptValue = EncryptAndDecryptUtil.decryptSm4(EncryptAndDecryptUtil.decryptSm2(key), value);
+ log.info("接收数港安全月历审核结果成功,解密报文:{}", decryptValue);
SgCalendarAuditDTO auditDTO = JSON.parseObject(decryptValue, SgCalendarAuditDTO.class);
String validateMessage = validateAudit(auditDTO);
if (validateMessage != null) {
diff --git a/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml b/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
index 5b33c9d..21566e2 100644
--- a/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
@@ -39,10 +39,10 @@
AND duty_phone LIKE CONCAT('%', #{params.dutyPhone}, '%')
- AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)) >= #{params.startDutyTime}
+ AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)), 10) >= LEFT(#{params.startDutyTime}, 10)
- AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)) <= #{params.endDutyTime}
+ AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)), 10) <= LEFT(#{params.endDutyTime}, 10)
ORDER BY create_time DESC