Merge remote-tracking branch 'origin/master'

rain

2026-01-28 54898304203f3ea0c132899dca4341dc182d13de

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

@@ -33,6 +33,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.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
@@ -63,6 +65,8 @@

   @Override
   public IPage<FwDefenseSceneVO> selectFwDefenseScenePage(IPage<FwDefenseSceneVO> page, FwDefenseSceneVO fwDefenseScene) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwDefenseScene.setDeptList(deptList);
      IPage<FwDefenseSceneVO> result = page.setRecords(baseMapper.selectFwDefenseScenePage(page, fwDefenseScene));
      List<FwDefenseSceneVO> records = result.getRecords();
      if (records == null || records.isEmpty()) {
@@ -134,8 +138,8 @@
   }

   @Override
   public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long areaId) {
      return baseMapper.selectFwDefenseSceneList(filterSelected, areaId);
   public List<FwDefenseSceneVO> selectFwDefenseSceneList(Integer filterSelected, Long zoneId, Long areaId) {
      return baseMapper.selectFwDefenseSceneList(filterSelected, zoneId, areaId);
   }

   private List<Long> parseIdList(String ids) {