From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
index b7cd859..c39ed33 100644
--- a/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml
@@ -33,6 +33,18 @@
 <if test="valueId !=null and valueId != ''">
    and av.value_id= #{valueId}
 </if> 
+<if test="userName !=null and userName != ''">
+   and ra.person_name= #{userName}
+</if>
+<if test="repName !=null and repName != ''">
+   and st.name= #{repName}
+</if>
+<if test="repTitle !=null and repTitle != ''">
+   and tt.title like concat('%',#{repTitle},'%')
+</if>
+<if test="valueContent !=null and valueContent != ''">
+   and av.value_content like concat('%',#{valueContent},'%')
+</if>
 <if test="createTime !=null and createTime != ''">
    and av.create_time= #{createTime}
 </if> 
@@ -57,7 +69,7 @@
 <if test="settingId !=null and settingId != ''">
    and av.setting_id= #{settingId}
 </if> 
-order by av.create_time desc
+order by ra.person_name,tt.title,av.create_time desc
 <if test="page != -1 and page != null ">
    limit #{page}, #{row}
 </if> 

--
Gitblit v1.8.0