zhongrj
2024-04-02 566e7986291e73051d30ee252b0ebf852b1577a7
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -37,6 +38,7 @@
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,9 +68,10 @@
   @Override
   public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      return page.setRecords(baseMapper.selectGridPage(page, grid,regionChildCodesList,isAdministrator));
//      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
//      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      CommonParamSet commonParamSet = new CommonParamSet().invoke(GridVO.class, grid);
      return page.setRecords(baseMapper.selectGridPage(page, grid,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator()));
   }
   /**
@@ -139,8 +142,8 @@
    * @return
    */
   @Override
   public List<String> getAddressCodeListByUserId(Long userId) {
      return baseMapper.getAddressCodeListByUserId(userId);
   public List<String> getAddressCodeListByUserId(Long userId,String addressCode) {
      return baseMapper.getAddressCodeListByUserId(userId,addressCode);
   }
   /**
@@ -184,6 +187,14 @@
   }
   /**
    * 空间分析
    */
   @Override
   public List<GridEntity> spatialAnalysis(String point) {
      return baseMapper.spatialAnalysis(point);
   }
   /**
    * 根据参数查询网格数据
    * @param place
    * @return