|
@@ -129,13 +129,15 @@ public class ApiAppDeviceLogController {
|
|
|
|
|
|
ApiPageDTO page = appDeviceService.getListBySQL(sql.toString(), new HashMap<>(), param);
|
|
|
// 组装数据
|
|
|
- List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
|
|
|
- for (Map<String, Object> p : list) {
|
|
|
- p.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
|
|
|
- p.put("customTitle", "骑享科技");
|
|
|
- p.put("operator", "admin");
|
|
|
+ if(null != page.getData()) {
|
|
|
+ List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
|
|
|
+ for (Map<String, Object> p : list) {
|
|
|
+ p.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
|
|
|
+ p.put("customTitle", "骑享科技");
|
|
|
+ p.put("operator", "admin");
|
|
|
+ }
|
|
|
+ page.setData(list);
|
|
|
}
|
|
|
- page.setData(list);
|
|
|
return page;
|
|
|
}
|
|
|
|