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' and g.DAY_OF_WEEK = #{dayOfWeek} @@ -44,7 +44,7 @@ ID FROM epdc_party_group_guide WHERE DAY_OF_WEEK = #{dayOfWeek} - AND DEL_FLAG = 0 + AND DEL_FLAG = '0' @@ -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 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' AND gr.PARTY_GROUP_ID IN 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..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 @@ -68,7 +68,7 @@ and v.ALL_DEPT_IDS like concat('%',#{deptId},'%') - ORDER BY u.POINTS desc,v.CREATED_TIME DESC + ORDER BY v.KINDNESS_TIME desc,u.POINTS DESC