From 54898304203f3ea0c132899dca4341dc182d13de Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 28 Jan 2026 17:20:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
index 1c65425..a76ffdc 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java
@@ -16,28 +16,34 @@
*/
package org.sxkj.fw.detection.service.impl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
-import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
+import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
+import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.mapper.FwTaskScheduleMapper;
import org.sxkj.fw.detection.service.IFwTaskScheduleService;
import org.springframework.stereotype.Service;
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.List;
/**
* 任务调度记录表 服务实现类
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@Service
public class FwTaskScheduleServiceImpl extends BaseServiceImpl<FwTaskScheduleMapper, FwTaskScheduleEntity> implements IFwTaskScheduleService {
@Override
- public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskScheduleVO fwTaskSchedule) {
+ public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskSchedulePageParam fwTaskSchedule) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwTaskSchedule.setDeptList(deptList);
return page.setRecords(baseMapper.selectFwTaskSchedulePage(page, fwTaskSchedule));
}
--
Gitblit v1.9.3