From 928e7940f36f63f3d678451f19a34091926e26d6 Mon Sep 17 00:00:00 2001
From: chenfei <18955928961@163.com>
Date: Wed, 17 Aug 2022 11:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=B2=E8=AF=8A=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/pc/TRecordController.java    | 8 +++-----
 .../src/main/resources/mapper/system/TRecordMapper.xml    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java
index ce64bb5..fd0c2fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pc/TRecordController.java
@@ -129,14 +129,12 @@ public class TRecordController extends BaseController
         if(id == null){
             return AjaxResult.error("未获取到id");
         }
-        Map<String,List<Object>> data = new HashMap<>();
-        List<TRecordResp> list = new ArrayList<>();
-        list.add(tRecordService.selectById(id));
-        data.put("result", Collections.singletonList(list));
+        Map<String,Object> data = new HashMap<>();
+        data.put("result", tRecordService.selectById(id));
         TImage tImage = new TImage();
         tImage.setThirdId(id);
         List<TImage> images = imageService.selectTImageList(tImage);
-        data.put("image", Collections.singletonList(images));
+        data.put("image", images);
         return AjaxResult.success(data);
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
index 287d7d7..c65392a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TRecordMapper.xml
@@ -208,7 +208,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag == null">
                 and td.del_flag = '0' and tp.del_flag = '0'
             </if>
-            <if test="createTime != null">
+            <if test="createTime != null and createTime !=''">
                and  DATE_FORMAT(tp.create_time,'%Y-%m') = #{createTime}
             </if>
             <if test="startTime != null  and startTime != '' and endTime == null "> and tr.create_time &gt;= #{startTime}</if>