Commit 6f055f2d authored by tangwei's avatar tangwei

修改bug

parent 63b6a374
...@@ -239,7 +239,7 @@ public class PlanController extends AbstractBaseController { ...@@ -239,7 +239,7 @@ public class PlanController extends AbstractBaseController {
public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) { public CommonResponse queryPointById(@ApiParam(value = "计划id", required = true) @PathVariable(name = "id") Long id) {
Plan plan = planService.queryPlanById(id); Plan plan = planService.queryPlanById(id);
Object ob= ToJson.tojson(plan); Object ob= plan!=null?ToJson.tojson(plan):null;
return CommonResponseUtil.success(ob); return CommonResponseUtil.success(ob);
} }
......
...@@ -119,7 +119,8 @@ public class PointController extends AbstractBaseController { ...@@ -119,7 +119,8 @@ public class PointController extends AbstractBaseController {
try { try {
List<Map<String, Object>> pointInputItemList = iPointService.queryEquipPointInputItem(pointId); List<Map<String, Object>> pointInputItemList = iPointService.queryEquipPointInputItem(pointId);
Page<Map<String, Object>> pag =new PageImpl<Map<String, Object>>(pointInputItemList); Page<Map<String, Object>> pag =new PageImpl<Map<String, Object>>(pointInputItemList);
Object ov= ToJson.tojson(pag);
Object ov= pag!=null?ToJson.tojson(pag):null;
return CommonResponseUtil.success(ov); return CommonResponseUtil.success(ov);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
...@@ -1433,7 +1434,7 @@ public class PointController extends AbstractBaseController { ...@@ -1433,7 +1434,7 @@ public class PointController extends AbstractBaseController {
String companyBizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode(); String companyBizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
Page Page=iPointService.queryPointList4RouteNew(companyBizOrgCode,riskSourceId, pointNo, name, pageNumber, pageSize,companyId); Page Page=iPointService.queryPointList4RouteNew(companyBizOrgCode,riskSourceId, pointNo, name, pageNumber, pageSize,companyId);
Object ob=ToJson.tojson(Page); Object ob=Page!=null?ToJson.tojson(Page):null;
return CommonResponseUtil.success(ob); return CommonResponseUtil.success(ob);
} }
......
...@@ -144,7 +144,7 @@ public class RouteController extends AbstractBaseController { ...@@ -144,7 +144,7 @@ public class RouteController extends AbstractBaseController {
return CommonResponseUtil.success(!Objects.isNull(isRemove) && 1 == isRemove ? ToJson.tojson(routeList) : ToJson.tojson(list)); return CommonResponseUtil.success(!Objects.isNull(isRemove) && 1 == isRemove ? (routeList!=null?ToJson.tojson(routeList):null) : (list!=null?ToJson.tojson(list):null));
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return CommonResponseUtil.failure("查询巡检路线信息失败"); return CommonResponseUtil.failure("查询巡检路线信息失败");
......
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