From 22a8cf0fc39555be78a030d208215fa7f6ad6bc4 Mon Sep 17 00:00:00 2001 From: DESKTOP-71BH0QO\L、ming <172680469@qq.com> Date: 星期三, 28 四月 2021 10:34:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java index edaf122..66e1a7c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java @@ -52,9 +52,10 @@ " </if> \n" + "<if test='pageQuestnaireDTO.startTime != null '>\n" + - " AND aq.create_at BETWEEN \n" + - "#{pageComActDTO.startTime} \n" + - " AND #{pageQuestnaireDTO.endTime}\n" + + " AND aq.create_at <![CDATA[>=]]> #{pageQuestnaireDTO.startTime} \n" + + "</if>" + + "<if test='pageQuestnaireDTO.endTime != null '>\n" + + " AND aq.create_at <![CDATA[<=]]> #{pageQuestnaireDTO.endTime} \n" + " </if> \n" + " ORDER BY \n" + " aq.create_at DESC" + -- Gitblit v1.7.1