Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -108,9 +108,6 @@
   private IGridRangeService gridRangeService;

   @Autowired
   private IGridmanService gridmanService;

   @Autowired
   private GridMapper gridMapper;

   @Autowired
@@ -734,6 +731,8 @@
         placeExtEntity.setUpdateUser(AuthUtil.getUserId());
         // 新增场所详情
         placeExtService.save(placeExtEntity);
      } else {
         placeExtService.updateById(placeVO.getPlaceExtEntity());
      }
   }

@@ -988,9 +987,9 @@
            placeRelEntity.setPlaceId(placeEntity.getId());
            placeRelEntity.setStreetName(placeExcel.getStreetName());
            QueryWrapper<Region> wrapper = new QueryWrapper<>();
            wrapper.eq("name",placeExcel.getCommunityName());
            wrapper.eq("name", placeExcel.getCommunityName());
            Region region = SpringUtils.getBean(IRegionService.class).getOne(wrapper);
            if (null!=region){
            if (null != region) {
               placeRelEntity.setCommunityCode(region.getCode());
            }
            placeRelEntity.setCommunityName(placeExcel.getCommunityName());
@@ -1034,10 +1033,10 @@
      if (!Strings.isBlank(placeExcel.getLabelCode())) {
         // 匹配标签
         QueryWrapper<CategoryEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("level",3).eq("category_name",placeExcel.getLabelCode()).eq("is_deleted",0);
         wrapper.eq("level", 3).eq("category_name", placeExcel.getLabelCode()).eq("is_deleted", 0);
         // 查询
         List<CategoryEntity> list = SpringUtils.getBean(ICategoryService.class).list(wrapper);
         if (list.size()>0){
         if (list.size() > 0) {
            PlaceVO placeVO = new PlaceVO();
            CategoryEntity categoryEntity = list.get(0);
            placeVO.setLabel(categoryEntity.getCategoryNo());
@@ -1505,4 +1504,20 @@
      }
      return null;
   }

   /**
    * 企业商超列表查询
    */
   @Override
   public IPage<PlaceVO> selectMallPage(IPage<PlaceVO> page, PlaceVO place) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
      List<PlaceVO> placeVOS = baseMapper.selectMallPage(page,
         place,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator());
      // 返回
      return page.setRecords(placeVOS);
   }
}