Merge remote-tracking branch 'origin/master'

linwei

2026-01-14 bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java

@@ -37,7 +37,6 @@
import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
import org.sxkj.fw.area.wrapper.FwDefenseZoneWrapper;
import org.sxkj.fw.area.service.IFwDefenseZoneService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
@@ -73,8 +72,11 @@
      if (id == null) {
         return R.fail("主键不能为空");
      }
      FwDefenseZoneEntity detail = fwDefenseZoneService.getById(id);
      return R.data(FwDefenseZoneWrapper.build().entityVO(detail));
      FwDefenseZoneVO detail = fwDefenseZoneService.selectFwDefenseZoneDetail(id);
      if (detail == null) {
         return R.fail("数据不存在");
      }
      return R.data(detail);
   }
//   /**
//    * 防区管理表 分页
@@ -93,7 +95,7 @@
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入fwDefenseZone")
   public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneVO fwDefenseZone, Query query) {
   public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneDTO fwDefenseZone, Query query) {
      IPage<FwDefenseZoneVO> pages = fwDefenseZoneService.selectFwDefenseZonePage(Condition.getPage(query), fwDefenseZone);
      return R.data(pages);
   }