From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
index eaa7678..d444ab8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java
@@ -42,7 +42,7 @@
@ApiOperation("鏌ヨ渚涜�呰浆杩愮櫥璁板垪琛�")
// @PreAuthorize("@ss.hasPermi('system:transport:list')")
@PostMapping("/list")
- public Map<String, Object> list(ServiceTransport serviceTransport) {
+ public Map<String, Object> list(@RequestBody ServiceTransport serviceTransport) {
Page<ServiceTransport> serviceTransportPage = serviceTransportService.queryList(serviceTransport);
return getDataTable(serviceTransportPage.getRecords(), (int) serviceTransportPage.getTotal());
}
@@ -73,7 +73,6 @@
ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
serviceTransportFile.setDelFlag(0);
serviceTransportFile.setTransportId(transport.getId());
- serviceTransportFile.setCaseNo(transport.getCaseNo());
List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
transport.setAnnexfilesList(serviceTransportFiles);
}
@@ -107,7 +106,7 @@
public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
boolean b = serviceTransportService.updateById(serviceTransport);
if (b) {
- serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
+ serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
}
return toAjax(b);
}
--
Gitblit v1.9.3