Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/service/impl/GdFlyerServiceImpl.java

@@ -31,6 +31,7 @@
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.system.cache.SysCache;

import java.util.ArrayList;
import java.util.List;

/**
@@ -44,16 +45,20 @@

   @Override
   public IPage<GdFlyerVO> selectGdFlyerPage(IPage<GdFlyerVO> page, GdFlyerPageParam gdFlyer) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      gdFlyer.setDeptList(deptList);
      // 通过经纬度获取行政区划
       if (!AuthUtil.isAdministrator()) {
         List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         gdFlyer.setDeptList(deptList);
      }
            // 通过经纬度获取行政区划
      if (StringUtil.isNotBlank(gdFlyer.getLongitude()) && StringUtil.isNotBlank(gdFlyer.getLatitude())) {
         String areaCode = GdGeoAddressUtil.getCountyCode(Double.valueOf(gdFlyer.getLongitude()), Double.valueOf(gdFlyer.getLatitude()));
         if (areaCode != null && areaCode.length() > 6) {
            areaCode = areaCode.substring(0, 6);
         // 去掉前面三位数字
         if (areaCode != null && areaCode.length() > 3) {
            areaCode = areaCode.substring(3);
         }
         gdFlyer.setAreaCode(areaCode);
      }

      return page.setRecords(baseMapper.selectGdFlyerPage(page, gdFlyer));
   }