Commit 68fbc881 authored by chenzhao's avatar chenzhao

修改bug

parent 7a7b97eb
...@@ -169,16 +169,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -169,16 +169,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
String[] split = sort != null ? sort.split(",") : null; String[] split = sort != null ? sort.split(",") : null;
String data = split != null ? RedisKey.humpToLine(split[0]) : null;
/*2407 【web】日常值班>警情记录>接警记录,表头排序功能失效 chenzhao 09-28 start*/ /*2407 【web】日常值班>警情记录>接警记录,表头排序功能失效 chenzhao 09-28 start*/
if (data != null) { if (split[0] != null) {
if (data.equals("alertType") || data.equals("alertSource") || data.equals("alarmType")) { if (split[0].equals("alertType") || split[0].equals("alertSource") || split[0].equals("alarmType")) {
data = data + "Code"; split[0] = split[0] + "Code";
} }
if (data.equals("alertStatusStr")) { if (split[0].equals("alertStatusStr")) {
data = "alert_status"; split[0] = "alertStatus";
} }
} }
String data = split != null ? RedisKey.humpToLine(split[0]) : null;
/*2407 【web】日常值班>警情记录>接警记录,表头排序功能失效 chenzhao 09-28 end*/ /*2407 【web】日常值班>警情记录>接警记录,表头排序功能失效 chenzhao 09-28 end*/
String lift = split != null ? split[1] : null; String lift = split != null ? split[1] : null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment