Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/EquipmentManageController.java

@@ -8,6 +8,7 @@ import com.ai.abc.api.model.CommonRequest;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.components.common.model.PageInfo;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.work.tool.model.ResourceTool;
import com.ai.bss.work.tool.model.ResourceToolType;
import com.alibaba.fastjson.TypeReference;
@@ -40,6 +41,12 @@ public class EquipmentManageController {
	@ResponseBody
	@RequestMapping("/queryEquipmentInfo")
	public CommonResponse<PageBean<Map<String, Object>>> queryEquipmentInfo(@RequestBody CommonRequest<HashMap<String, Object>> conditionMap) throws Exception {
		// 当前页数
		int pageNumber = conditionMap.getPageNumber() < 1 ? 1 : conditionMap.getPageNumber();
		// 每页条数
		int pageSize = conditionMap.getPageSize() < 1 ? EbcConstant.DEFAULT_PAGE_SIZE : conditionMap.getPageSize();
		conditionMap.setPageSize(pageSize);
		conditionMap.setPageNumber(pageNumber);
		conditionMap.getData().put("workOrgId","0000");
		return equipmentManageService.queryEquipmentInfo(conditionMap);
	}