Commit 61ccebf8 authored by 王夏晖's avatar 王夏晖

修改返回前台数据,为null的列不过滤

parent 9d94f300
...@@ -2,6 +2,9 @@ package org.rcisoft.business.manage.controller; ...@@ -2,6 +2,9 @@ package org.rcisoft.business.manage.controller;
/*固定导入*/ /*固定导入*/
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.rcisoft.business.manage.entity.BusDeviceTp; import org.rcisoft.business.manage.entity.BusDeviceTp;
import org.rcisoft.business.manage.service.BusDeviceTpService; import org.rcisoft.business.manage.service.BusDeviceTpService;
...@@ -61,8 +64,8 @@ public class BusDeviceTpController extends PaginationController<BusDeviceTp> { ...@@ -61,8 +64,8 @@ public class BusDeviceTpController extends PaginationController<BusDeviceTp> {
@ApiOperation(value="设备类型列表", notes="设备类型列表") @ApiOperation(value="设备类型列表", notes="设备类型列表")
@GetMapping(value = "/queryBusDeviceTpList") @GetMapping(value = "/queryBusDeviceTpList")
public List<Map<String,Object>> queryBusDeviceTpList(@RequestParam String proId) { public String queryBusDeviceTpList(@RequestParam String proId) {
return busDeviceTpServiceImpl.queryBusDeviceTpList(proId); return JSON.toJSONString(busDeviceTpServiceImpl.queryBusDeviceTpList(proId), SerializerFeature.WriteMapNullValue);
} }
@RequestMapping("/upload") @RequestMapping("/upload")
......
...@@ -39,7 +39,7 @@ pagehelper: ...@@ -39,7 +39,7 @@ pagehelper:
spring: spring:
jackson: jackson:
default-property-inclusion: non_null
#http: #http:
# encoding: # encoding:
# force: true # force: true
......
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