From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
index bbce527..00459f5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceScrapServiceImpl.java
@@ -57,11 +57,13 @@
@Override
@Transactional
public boolean saveFwDeviceScrap(FwDeviceScrapDTO dto) {
+ // 先保存报废记录，成功后再处理设备状态与逻辑删除
boolean isSuccess = super.save(FwDeviceScrapWrapper.build().entityDTO(dto));
if (isSuccess) {
FwDeviceEntity fwDevice = new FwDeviceEntity();
fwDevice.setId(dto.getDeviceId());
fwDevice.setStatus(3);
+ // 更新设备状态并做逻辑删除，保持报废与设备状态一致
isSuccess = fwDeviceService.updateById(fwDevice) && fwDeviceService.deleteLogic(Collections.singletonList(fwDevice.getId()));
}
return isSuccess;
@@ -69,8 +71,11 @@
@Override
public IPage<FwDeviceScrapVO> selectFwDeviceScrapPage(IPage<FwDeviceScrapVO> page, FwDeviceScrapDTO fwDeviceScrap) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
- fwDeviceScrap.setDeptList(deptList);
+ // 按当前部门及下级部门范围过滤数据
+ if (!AuthUtil.isAdministrator()) {
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ fwDeviceScrap.setDeptList(deptList);
+ }
return page.setRecords(baseMapper.selectFwDeviceScrapPage(page, fwDeviceScrap));
}
@@ -78,9 +83,6 @@
@Override
public List<FwDeviceScrapExcel> exportFwDeviceScrap(Wrapper<FwDeviceScrapEntity> queryWrapper) {
List<FwDeviceScrapExcel> fwDeviceScrapList = baseMapper.exportFwDeviceScrap(queryWrapper);
- //fwDeviceScrapList.forEach(fwDeviceScrap -> {
- // fwDeviceScrap.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwDeviceScrap.getType()));
- //});
return fwDeviceScrapList;
}
--
Gitblit v1.9.3