From c9fab06805357db21713c7007fa1f4d037b3529e Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Wed, 24 Oct 2018 08:50:51 +0800 Subject: [PATCH] 优化 --- src/main/java/com/moral/controller/ScreenController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index b3a2be2..f0c0f43 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -149,7 +149,7 @@ areaNamesBuilder.append(String.join("/",names)); } // ������������ - if( 0 == organization.getRank()) { + if(organization.getRank()!=null && organization.getRank() == 0) { resultMap.put("type","enterprise"); }else{ resultMap.put("type","government"); @@ -166,7 +166,7 @@ }else if(organization.getProvinceCode()!=null) { mapAreaCode = organization.getProvinceCode(); } - resultMap.put("mapAreaCode ",mapAreaCode.toString() ); + resultMap.put("mapAreaCode",mapAreaCode.toString() ); } resultMap.put("mapPath",areaNamesBuilder.toString()); } @@ -705,7 +705,7 @@ @ApiImplicitParams(value = { @ApiImplicitParam(name = "orgid",defaultValue = "5",value = "������id", required = true, paramType = "query", dataType = "Integer"), }) - public ResultBean<List<Map>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) { + public ResultBean<List<Map<String,Object>>> getAqi24HoursNC(@RequestParam("orgid") Integer organizationId) { return new ResultBean<>(hangzhouAqiService.queryAqi24Hours(organizationId)); } @GetMapping("mpt-dev-summary") -- Gitblit v1.8.0