Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -71,9 +71,9 @@
   }

   @Override
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys) {
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime) {
      List<String> areaTypeKeyList = parseAreaTypeKeyList(areaTypeKeys);
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeyList);
      List<FwAreaDivideVO> areaDivideList = baseMapper.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeyList, isSetSceneManage, flyTime);
      // 获取面数据
      if (areaDivideList != null && !areaDivideList.isEmpty()) {
         enrichWithExtensionData(areaDivideList);
@@ -204,6 +204,7 @@
                                                         FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwAreaDivideStatistics.setDeptList(deptList);
      fwAreaDivideStatistics.setAreaTypeKeyList(parseAreaTypeKeyList(fwAreaDivideStatistics.getAreaTypeKeys()));
      return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
   }