Merge remote-tracking branch 'origin/feature/lc_modifyPartyGroup'

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>

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=")">

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">
@@ -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"