Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -384,7 +384,7 @@
         WHERE del_flag = '0'
         and ABANDON_FLAG='0'
         AND pid = #{agencyId}
-        ORDER BY created_time DESC
+        ORDER BY sort asc,created_time asc
     </select>
 
     <select id="selectGridListByIds" resultType="com.epmet.dto.CustomerGridDTO">

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberPayRecordDetailDao.xml

@@ -61,10 +61,12 @@
             prd.*
         from ic_party_member_pay_record_detail prd
         where prd.DEL_FLAG = 0
+        <if test="monthList != null and monthList.size() > 0">
             AND CONCAT(prd.YEAR,'-',prd.MONTH) IN
             <foreach collection="monthList" index="index" item="month" open="(" separator="," close=")">
                 #{month}
             </foreach>
+        </if>
         <if test='partyMemberId != "" and partyMemberId != null'>
             and prd.PARTY_MEMBER_ID = #{partyMemberId}
         </if>