Merge branch 'dev_grid_patrol' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -92,11 +92,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		//状态为巡查中时返回所在网格ID和名称
 		if (PatrolConstant.PATROLLING.equals(entity.getStatus())) {
 			CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO();
-			customerGridFormDTO.setGridId(formDTO.getGridId());
+			customerGridFormDTO.setGridId(entity.getGrid());
 			Result<CustomerGridDTO> gridResult = govOrgFeignClient.getGridBaseInfoByGridId(customerGridFormDTO);
 			if (!gridResult.success() || null == gridResult.getData()) {
 				//查询网格名称失败
-				log.error(String.format("查找网格信息失败，网格Id:【%s】", formDTO.getGridId()));
+				log.error(String.format("查找网格信息失败，网格Id:【%s】", entity.getGrid()));
 				throw new RenException(gridResult.getCode(), gridResult.getMsg());
 			}
 			CustomerGridDTO grid = gridResult.getData();