Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/data-acquisition

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/DataStatisticsMapper.xml

@@ -15,7 +15,8 @@
         <if test="params.endDate != null and params.endDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ <= ]]>  #{params.endDate}
         </if>
-        <if test="params.startDate == null and params.endDate == null">
+        <if test="(params.startDate == null or params.startDate == '')
+              and (params.endDate == null or params.endDate == '')">
             and datediff(week, tw.Rq,getdate())=0
         </if>
         group by Convert(varchar(10),tw.Rq,120)
@@ -36,17 +37,12 @@
         <if test="params.endDate != null and params.endDate != ''">
             and Convert(varchar(10),tw.Rq,120) <![CDATA[ <= ]]>  #{params.endDate}
         </if>
-        <if test="params.startDate == null and params.endDate == null">
+        <if test="(params.startDate == null or params.startDate == '')
+              and (params.endDate == null or params.endDate == '')">
             and datediff(week, tw.Rq,getdate())=0
         </if>
     </select>
 
 
 
-
-
-
-
-
-
 </mapper>