Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -169,16 +169,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 
 
         String[] split = sort != null ? sort.split(",") : null;
-        String data = split != null ? RedisKey.humpToLine(split[0]) : null;
         /*2407 【web】日常值班>警情记录>接警记录，表头排序功能失效 chenzhao 09-28 start*/
-        if (data != null) {
-            if (data.equals("alertType") || data.equals("alertSource") || data.equals("alarmType")) {
-                data = data + "Code";
+        if (split[0] != null) {
+            if (split[0].equals("alertType") || split[0].equals("alertSource") || split[0].equals("alarmType")) {
+                split[0] = split[0] + "Code";
             }
-            if (data.equals("alertStatusStr")) {
-                data = "alert_status";
+            if (split[0].equals("alertStatusStr")) {
+                split[0] = "alertStatus";
             }
         }
+        String data = split != null ? RedisKey.humpToLine(split[0]) : null;
+
+
         /*2407 【web】日常值班>警情记录>接警记录，表头排序功能失效 chenzhao 09-28 end*/
         String lift = split != null ? split[1] : null;