BUG 修改

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

@@ -286,12 +286,41 @@ public class KeySiteController extends BaseController {
                 useNature, fireFacilitiesInfo, bizOrgCode));
     }
 
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/pageNew")
+	@ApiOperation(httpMethod = "GET", value = "重点部位分页查询", notes = "重点部位分页查询")
+	public ResponseModel<IPage<KeySiteDto>> queryForPageNew(
+			@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,
+			@RequestParam(required = false) String useNature,
+			@RequestParam(required = false) String fireFacilitiesInfo,
+			@RequestParam String bizOrgCode) {
+		Page<KeySiteDto> page = new Page<KeySiteDto>();
+		page.setCurrent(current);
+		page.setSize(size);
+
+
+		return ResponseHelper.buildResponse(keySiteServiceImpl.getPageList(page, name, buildingId, fireEnduranceRate,
+				useNature, fireFacilitiesInfo, bizOrgCode));
+	}
+
 	@PersonIdentify
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/keySiteCountAndBuildingTree", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据登录人角色获取当前单位下的所在建筑的重点部位统计值", notes = "根据登录人角色获取当前单位下的所在建筑的重点部位统计值")
 	public ResponseModel<List<Map<String, Object>>> keySiteCountAndBuildingTree(
-			@RequestParam(required = false) String bizOrgCode) {
+			@RequestParam String bizOrgCode) {
 		return ResponseHelper.buildResponse(keySiteService.keySiteCountAndBuildingTree(bizOrgCode));
 	}
 }