From 984a351ccc8ab7820506bb0e28d0331de4ff38db Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 19 Jun 2020 14:03:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/VolunteerInfoDao.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 3cb1fe59..4fab946f 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -68,7 +68,7 @@
         <if test="deptId !='' and deptId != null">
             and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')
         </if>
-        ORDER BY u.POINTS desc,v.CREATED_TIME DESC
+        ORDER BY v.KINDNESS_TIME desc,u.POINTS DESC
     </select>
 
     <select id="volunteerInfoCount" resultType="int">

From 0aa3a4589b8253c14e8cb6455a068a3fb3e07695 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 19 Jun 2020 15:51:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/PartyGroupGuideDao.xml      | 8 ++++----
 .../main/resources/mapper/PartyGroupGuideRelationDao.xml  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml
index 91a357bb..f02570b4 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideDao.xml
@@ -28,7 +28,7 @@
             epdc_party_group_guide g
             LEFT JOIN epdc_party_group_guide_relation gr ON g.id = gr.PARTY_GROUP_GUIDE_ID
             LEFT JOIN epdc_party_group pg ON gr.PARTY_GROUP_ID = pg.id
-        WHERE g.DEL_FLAG = 0 and gr.DEL_FLAG = 0
+        WHERE g.DEL_FLAG = '0' and gr.DEL_FLAG = '0'
             <if test="dayOfWeek != null and  dayOfWeek != '' ">
                 and g.DAY_OF_WEEK = #{dayOfWeek}
             </if>
@@ -44,7 +44,7 @@
           ID
         FROM epdc_party_group_guide
         WHERE DAY_OF_WEEK = #{dayOfWeek}
-        AND DEL_FLAG = 0
+        AND DEL_FLAG = '0'
     </select>
 
     <select id="selectOneGuideInfo" resultType="String">
@@ -52,7 +52,7 @@
           CONTENT content
         FROM epdc_party_group_guide g
         LEFT JOIN epdc_party_group_guide_relation gr ON g.id = gr.PARTY_GROUP_GUIDE_ID
-        WHERE g.DEL_FLAG = 0 AND gr.DEL_FLAG = 0
+        WHERE g.DEL_FLAG = '0' AND gr.DEL_FLAG = '0'
           AND g.DAY_OF_WEEK = dayofweek(curdate())-1
           AND gr.PARTY_GROUP_ID = #{partyGroupId}
     </select>
@@ -63,7 +63,7 @@
           CONTENT content
         FROM epdc_party_group_guide g
         LEFT JOIN epdc_party_group_guide_relation gr ON g.id = gr.PARTY_GROUP_GUIDE_ID
-        WHERE g.DEL_FLAG = 0 AND gr.DEL_FLAG = 0
+        WHERE g.DEL_FLAG = '0' AND gr.DEL_FLAG = '0'
           AND gr.PARTY_GROUP_ID = #{partyGroupId}
         ORDER BY g.DAY_OF_WEEK
     </select>
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideRelationDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideRelationDao.xml
index 9416d38d..b24ae45c 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupGuideRelationDao.xml
@@ -34,7 +34,7 @@
           GROUP_CONCAT(pg.PARTY_GROUP_NAME  SEPARATOR  ',') partyGroupName
         FROM epdc_party_group_guide_relation gr
 		LEFT JOIN epdc_party_group pg ON gr.PARTY_GROUP_ID = pg.id
-        WHERE gr.DEL_FLAG = 0
+        WHERE gr.DEL_FLAG = '0'
             <if test="partyGroupIdList!=null and partyGroupIdList.size()>0">
                 AND gr.PARTY_GROUP_ID IN
                 <foreach collection="partyGroupIdList" index="index" item="deptId" open="(" separator="," close=")">

From 157559eb570ba92349e6d2ba35989915f6dba407 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 19 Jun 2020 17:10:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=9620?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/VolunteerInfoDao.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 4fab946f..a715346b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -190,7 +190,7 @@
             left join epdc_user eu on eu.id = vi.USER_ID
             WHERE vi.DEL_FLAG = '0'  AND vi.AUDIT_STATUS IN ('0', '1')
             order by vi.KINDNESS_TIME desc,vi.PARTICIPATION_NUM desc,vi.REGIST_TIME  ) as info, (select @i:=0) j ) volunteerInfo
-        where sort &lt; 11
+        where sort &lt; 21
     </select>
     <!--  根据用户id查询志愿者信息  -->
     <select id="selectOneVolunteerInfoDTO" parameterType="java.lang.String"