Merge branch 'chenhao' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -114,6 +114,7 @@
         FROM
         jc_alert_called a
         <where>
+            1=1
             <if test="alertStatus!= null ">
                 and alert_status = #{alertStatus}
             </if>
@@ -126,16 +127,16 @@
             <if test="alertSourceCode!= null ">
                 and alert_source_code = #{alertSourceCode}
             </if>
+            <if test="data != null and lift == 'ascend'">
+                order by #{data} ASC  limit #{current},#{size}
+            </if>
+            <if test="data != null and lift == 'descend'">
+                order by #{data} DESC  limit #{current},#{size}
+            </if>
+            <if test="data == null ">
+                order by call_time DESC  limit #{current},#{size}
+            </if>
         </where>
-        <if test="data != null and lift == 'ascend'">
-            order by #{data} ASC  limit #{current},#{size}
-        </if>
-        <if test="data != null and lift == 'descend'">
-            order by #{data} DESC  limit #{current},#{size}
-        </if>
-        <if test="data == null ">
-            order by call_time DESC  limit #{current},#{size}
-        </if>
     </select>