Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

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

@@ -134,8 +134,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) {
@@ -221,19 +221,19 @@
            deptId = null;
         }
      }
      String areaCode = HeaderUtils.getAreaCode();
      if (StringUtil.isBlank(areaCode)) {
         areaCode = fwDefenseScene.getAreaCode();
      }
//      String areaCode = HeaderUtils.getAreaCode();
//      if (StringUtil.isBlank(areaCode)) {
//         areaCode = fwDefenseScene.getAreaCode();
//      }
      Date now = new Date();
      fwDefenseScene.setCreateUser(userId);
      fwDefenseScene.setUpdateUser(userId);
      if (deptId != null) {
         fwDefenseScene.setCreateDept(deptId);
      }
      if (StringUtil.isNotBlank(areaCode)) {
         fwDefenseScene.setAreaCode(areaCode);
      }
//      if (StringUtil.isNotBlank(areaCode)) {
//         fwDefenseScene.setAreaCode(areaCode);
//      }
      fwDefenseScene.setCreateTime(now);
      fwDefenseScene.setUpdateTime(now);
   }