From b970185536bc58742fc29946b50c487a2de52bac Mon Sep 17 00:00:00 2001
From: kknd97 <liujingwei@ln.chinamobile.com>
Date: 星期四, 20 十月 2022 14:27:02 +0800
Subject: [PATCH] update ruoyi-ui/src/views/system/user/index.vue. handleUpdate(row)方法中：this.form = response.data;语句 会导致【this.form.postIds = response.postIds;】和【this.form.roleIds = response.roleIds;】失效。 导致用户编辑对话框中，角色和部门多选框无法正常修改。 建议使用以下语句修改： this.$set(this.form, "postIds", response.postIds); this.$set(this.form, "roleIds", response.roleIds);
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index da91d73..6137c86 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -694,12 +694,19 @@
// 得到导出对象.
T vo = (T) list.get(i);
Collection<?> subList = null;
- if (isSubListValue(vo))
+ if (isSubList())
{
- subList = getListCellValue(vo);
- subMergedLastRowNum = subMergedLastRowNum + subList.size();
+ if (isSubListValue(vo))
+ {
+ subList = getListCellValue(vo);
+ subMergedLastRowNum = subMergedLastRowNum + subList.size();
+ }
+ else
+ {
+ subMergedFirstRowNum++;
+ subMergedLastRowNum++;
+ }
}
-
int column = 0;
for (Object[] os : fields)
{
--
Gitblit v1.9.2