Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -50,9 +50,7 @@
     <select id="getChannelSiteCnt" resultType="integer">
         select count(t1.channel_id) as siteCnt
 		from mp_channel t1
-		left join mp_channel t2 on t1.parent_id = t2.channel_id
-		where t1.`level`= 0
-		and t2.channel_no like concat(#{channelNo}, '.%')
+		where t1.`level`= 0 and t1.channel_no like concat(#{channelNo}, '.%')
     </select>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelUserRelMapper.xml

@@ -30,7 +30,7 @@
 		from mp_channel_user_rel t1
 		left join mp_channel t2 on t1.channel_id = t2.channel_id
 		where t2.channel_no like concat(#{channelNo}, '.%')
-		<if test="days != null and days != ''">
+		<if test="days != null">
 			<!-- AND date_format(t1.created_time,'%Y-%m-%d') between date_format(DATE_ADD(CURDATE(),INTERVAL #{days} DAY),'%Y-%m-%d') and date_format(CURDATE(),'%Y-%m-%d') -->
 			AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
 		 </if>