Merge remote-tracking branch 'origin/master'

linwe

2023-12-20 f213e5a87147de99afedf92fe78086c1aaa6d3c1

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -27,6 +27,7 @@
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
@@ -90,7 +91,17 @@
            place.setCreateUser(AuthUtil.getUserId());
         }
      }
      return page.setRecords(baseMapper.selectPlacePage(page, place,list));
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
      // 遍历
      for (PlaceVO placeVO : placeVOS) {
         // 设置对应的网格名称
         GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
         if (null!= gridVO){
            placeVO.setGridName(gridVO.getGridName());
         }
      }
      // 返回
      return page.setRecords(placeVOS);
   }

   /**