Merge remote-tracking branch 'origin/master'

lin

2024-02-26 88de0b5169112f8ea908cc2c048bc34286f8851d

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

@@ -24,6 +24,7 @@
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
@@ -48,6 +49,7 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceRelService;
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
@@ -119,16 +121,13 @@
    */
   @Override
   public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      List<String> list = new ArrayList<>();
      if (null != place.getRoleName() && !place.getRoleName().equals("")) {
         if (place.getRoleName().equals("网格员")) {
            // 查询对应的房屋地址code
            list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
         }
      }
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list, regionChildCodesList, isAdministrator);
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class,place);
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page,
         place,
         commonParamSet.getGridCodeList(),
         commonParamSet.getRegionChildCodesList(),
         commonParamSet.getIsAdministrator());
      // 返回
      return page.setRecords(placeVOS);
   }
@@ -313,6 +312,7 @@
         }
      } else {
         // 一对一,暂时不处理，后续考虑需加绑定关系表

      }
   }

@@ -327,6 +327,7 @@
         && !Strings.isBlank(placeVO.getLocation())
         && !Strings.isBlank(placeVO.getPlaceName())
         && !Strings.isBlank(placeVO.getImageUrls())
         && !Strings.isBlank(placeVO.getPrincipalIdCard())
      ) {
         // 已完善
         placeVO.setStatus(2);
@@ -792,6 +793,7 @@
            if (null != addressEntity) {
               placeVO = new PlaceVO();
               placeVO.setDoorplateAddressEntity(addressEntity);
               placeVO.setHouseCode(addressEntity.getAddressCode());
               placeVO.setLng(addressEntity.getX());
               placeVO.setLat(addressEntity.getY());
               placeVO.setLocation(addressEntity.getAddressName());