Merge remote-tracking branch 'origin/master'

rain

2026-01-28 54898304203f3ea0c132899dca4341dc182d13de

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

@@ -32,6 +32,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -52,6 +54,8 @@

   @Override
   public IPage<FwAreaDivideVO> selectFwAreaDividePage(IPage<FwAreaDivideVO> page, FwAreaDivideDTO fwAreaDivide) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwAreaDivide.setDeptList(deptList);
      return page.setRecords(baseMapper.selectFwAreaDividePage(page, fwAreaDivide));
   }

@@ -163,6 +167,8 @@
   @Override
   public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
         FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwAreaDivideStatistics.setDeptList(deptList);
      return page.setRecords(baseMapper.selectFwAreaDivideStatisticsPage(page, fwAreaDivideStatistics));
   }