From cfb4268742030ac94455f115666889750ebbbe13 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:18:54 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
index cc91e8f..07154a0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -92,9 +92,8 @@
}).sheet().doRead();
// 导出导入结果
HttpServletResponse response = WebUtils.response();
- response.setContentType("application/vnd.ms-excel;charset=utf-8");
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
- response.setHeader("Content-Length","1");
response.setHeader("Pragma", "no-cache");
if (failList.size() > 0) {
EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList);
diff --git a/ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml
index 3a3f884..7fc30bd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TDeptToUserMapper.xml
@@ -15,7 +15,7 @@
</sql>
<insert id="insertBatchUserDept">
insert into t_dept_to_user (dept_id, user_id) values
- <foreach collection="list" item="item" separator=",">
+ <foreach collection="deptToUserList" item="item" separator=",">
(#{item.deptId},#{item.userId})
</foreach>
</insert>
--
Gitblit v1.7.1