Merge branch 'feature/获取用户敏感信息' into 'developer'

sql

See merge request !906

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeMapper.xml

@@ -38,6 +38,9 @@
 
     <!--查询指定行数据-->
     <select id="listPage" resultMap="TabHaobanQywxFeeMap">
+    	<if test="interceptFlag != null and interceptFlag == 0">
+    		select <include refid="Base_Column_List"/> from (
+    	</if>
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_qywx_fee
@@ -60,8 +63,8 @@
             <choose>
                 <when test="interceptFlag != null and interceptFlag == 0">
                     and intercept_time between DATE(CURDATE()) and DATE_add(CURDATE(), INTERVAL 30 DAY)
+                    order by intercept_time asc ) t 
                     GROUP BY wx_enterprise_id
-                    order by intercept_time asc
                 </when>
                 <otherwise>
                     order by intercept_time desc