Merge remote-tracking branch 'origin/release' into release

dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java

@@ -180,7 +180,7 @@ public class SnEmailGatherTask {
                                     hashMap.put("Authorization",md5Encode);
                                     log.info("调用影像票夹接口，调用地址：{}，请求头：{}，请求参数：{}",snyxPjurl,snyxPjurl,JSONObject.toJSONString(ocrResult));
                                     String body = HttpRequest.post(snyxPjurl).addHeaders(hashMap).body(JSONObject.toJSONString(ocrResult)).timeout(300000).execute().body();
-                                    log.info("d调用影像票夹接口返回参数：{}",body);
+                                    log.info("调用影像票夹接口返回参数：{}",body);
                                     Map resultMap = JSONObject.parseObject(body, Map.class);
                                     Object status = resultMap.get("status");
                                     if(status != null && "200".equals(String.valueOf(status))){

dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml

@@ -27,7 +27,7 @@
     </select>
 
     <!--查询指定行数据-->
-    <select id="queryAllByLimit" resultMap="MailGatherLogMap" parameterType="java.util.Map">
+    <select id="queryAllByLimit" resultType= "com.dxhy.core.model.mailGather.MailGatherLogVo" parameterType="java.util.Map">
         SELECT
         m.create_time, e.dept_name, e.username,  m.from_address, m.file_name, m.file_type, m.ocr_type, m.error_msg
         FROM
@@ -49,10 +49,10 @@
             <if test="ocrType != null and ocrType != ''">
                 and m.ocr_type = #{ocrType}
             </if>
-            <if test="startTime !=null and startTime != ''">
+            <if test="startTime !=null">
                 and m.create_time >= #{startTime}
             </if>
-            <if test="endTime !=null and endTime != ''">
+            <if test="endTime !=null">
                 and #{endTime} >= m.create_time
             </if>
         </where>