From 3c94476f51df2b90787f9c7c0762a18e3094b80d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 15:01:22 +0800
Subject: [PATCH] yys 修改文件上传接口
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 5 +++++
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 2 +-
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 2 ++
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 3 ---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 14 ++++++++++++++
src/main/resources/mapper/system/SysUserMapper.xml | 5 ++++-
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 8 +++++++-
pom.xml | 10 +++++++++-
8 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 14851a3..938ccdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,7 +288,15 @@
<fork>true</fork> <!-- 濡傛灉娌℃湁璇ラ厤缃紝devtools涓嶄細鐢熸晥 -->
</configuration>
</plugin>
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>10</source>
+ <target>10</target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<repositories>
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index 816fe04..e23355d 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -36,6 +36,11 @@
*/
@Override
public void saveSupplier(SupplierManage supplierManage) {
+ LambdaQueryWrapper<SupplierManage> supplierManageLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ supplierManageLambdaQueryWrapper.eq(SupplierManage::getSupplierName,supplierManage.getSupplierName());
+ if (supplierMapper.selectCount(supplierManageLambdaQueryWrapper) > 0) {
+ throw new RuntimeException("渚涘簲鍟嗗凡瀛樺湪");
+ }
supplierMapper.insert(supplierManage);
}
diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index eb801bc..147c79a 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -35,7 +36,12 @@
public TempFile uploadFile(MultipartFile file,Integer type) throws IOException {
// 1. 鐢熸垚涓存椂鏂囦欢ID鍜岃矾寰�
String tempId = UUID.randomUUID().toString();
- Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());
+ String originalFilename = file.getOriginalFilename();
+ if(originalFilename == null) throw new IOException("鏂囦欢鍚嶄笉鑳戒负绌�");
+ String encodedFilename = java.net.URLEncoder.encode(originalFilename, StandardCharsets.UTF_8);
+ Path tempFilePath = Paths.get(tempDir, tempId + "_" + encodedFilename);
+
+// Path tempFilePath = Paths.get(tempDir, tempId + "_" + file.getOriginalFilename());
// 2. 纭繚鐩綍瀛樺湪
Path parentDir = tempFilePath.getParent();
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index aa787ed..14618a9 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -269,4 +269,18 @@
List<SysUser> sysUserList = userService.userListNoPage(user);
return AjaxResult.success(sysUserList);
}
+
+ /**
+ * 鏌ヨ褰撳墠鐢ㄦ埛鍏徃涓嬫墍鏈夌敤鎴�
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListNoPageByTenantId")
+ public AjaxResult userListNoPageByTenantId(SysUser user){
+ //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ user.setTenantId(loginUser.getTenantId());
+ List<SysUser> sysUserList = userService.userListNoPage(user);
+ return AjaxResult.success(sysUserList);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 9fc7b47..6bb8927 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -555,9 +555,6 @@
*/
@Override
public List<SysUser> userListNoPage(SysUser user) {
- //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- user.setTenantId(loginUser.getTenantId());
return userMapper.selectUserList(user);
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index f4ce895..8853bb0 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -178,6 +178,7 @@
List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
+ iPage.setTotal(iPage.getRecords().size());
return iPage;
}
for (SalesLedger salesLedger : iPage.getRecords()) {
@@ -204,6 +205,7 @@
iPage.getRecords().removeIf(salesLedger -> Objects.equals(salesLedger.getNoInvoiceAmountTotal(), new BigDecimal("0.00")));
}
}
+ iPage.setTotal(iPage.getRecords().size());
return iPage;
}
}
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 4e1040e..7ce76a8 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -29,7 +29,7 @@
T1.tenant_id,
T1.contract_amount,
T1.execution_date,
- T2.nick_name AS entry_person_name
+ T2.nick_name AS entry_person_name,
T1.payment_method
FROM
sales_ledger T1
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index cb0bdb3..f5164bc 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -64,7 +64,10 @@
LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
GROUP BY T1.user_id
) T2 on T2.user_id = u.user_id
- where u.del_flag = '0' and u.tenant_id = #{tenantId}
+ where u.del_flag = '0'
+ <if test="tenantId != null and tenantId != 0">
+ and u.tenant_id = #{tenantId}
+ </if>
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}
</if>
--
Gitblit v1.9.3