修改bug

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

@@ -126,16 +126,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>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -150,9 +150,12 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
                                            String startTime,
                                            String endTime,
                                            String sort) {
-        String[] split = sort.split(",");
-        String data = RedisKey.humpToLine(split[0]);
-        String lift  =split[1];
+
+
+        String[] split =  sort!=null? sort.split(","):null;
+        String data = split!=null? RedisKey.humpToLine(split[0]):null;
+        String lift  =split!=null?split[1]:null;
+
         List<AlertCalled> list = alertCalledMapper.selectAllPage(pageBean.getCurrent(), pageBean.getSize(), alertStatus, alertTypeCode, alertSourceCode, startTime, endTime,data,lift);
         IPage<AlertCalled> iPage = new Page<>();
         iPage.setRecords(list);