Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/KeySiteController.java

@@ -134,7 +134,7 @@ public class KeySiteController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/page")
+	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "重点部位分页查询",  notes = "重点部位分页查询")
 	public ResponseModel<IPage<KeySiteDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,@RequestParam(required = false)  String  name,@RequestParam(required = false) Long buildingId,@RequestParam(required = false)  String fireEnduranceRate,
@@ -160,19 +160,21 @@ public class KeySiteController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "机场单位部位树",   notes = "机场单位部位树")
 	@GetMapping(value = "/getOrguserTree")
-	public  ResponseModel<List<OrgMenuDto>> getOrguserTree() throws Exception{
+	public  ResponseModel<List<OrgMenuDto>> getOrguserTree() {
 		List<OrgMenuDto> list = new ArrayList<OrgMenuDto>();
 		OrgMenuDto orgMenuDto =new OrgMenuDto();
 		orgMenuDto.setChildren(keySiteService.getOrguserTree());
 		orgMenuDto.setName("单位管理");
+		orgMenuDto.setKey(-1L);
 		orgMenuDto.setTitle("单位管理");
 		list.add(orgMenuDto);
  		return ResponseHelper.buildResponse(list);
 	}
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "建筑部位树",   notes = "建筑部位树")
 	@GetMapping(value = "/getBuildTree/{buildingId}")
-	public  ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long buildingId) throws Exception{
+	public  ResponseModel<List<OrgMenuDto>> getBuildTree(@PathVariable Long buildingId) {
  		return ResponseHelper.buildResponse(keySiteService.getBuildAndKeyTree(buildingId));
 	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -191,7 +191,7 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 	public List<OrgMenuDto> getOrguserTree() {
 		List<OrgUsrTreeDto> list =	orgUsrMapper.getCompanyAndCountDepartment();
 		List<OrgMenuDto> menuList = list.stream().map(o -> {
-			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName()+" "+o.getNum(),
+			OrgMenuDto menu = new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName()+" ("+o.getNum() + ")",
 					ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.valueOf(o.getParentId()), o.getBizOrgType(), false,
 					o.getBizOrgCode());
 			return menu;