From 6af08bad1986a72fa196afeb04c389c005fab673 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 30 八月 2024 11:52:08 +0800
Subject: [PATCH] bug修改
---
finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java b/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
index 7e95dea..416112d 100644
--- a/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
+++ b/finance-system/src/main/java/com/finance/system/service/impl/TbFieldServiceImpl.java
@@ -13,6 +13,7 @@
import com.finance.common.exception.ServiceException;
import com.finance.common.utils.BeanUtils;
import com.finance.common.utils.CollUtils;
+import com.finance.common.utils.DateUtils;
import com.finance.common.utils.EasyExcelUtil;
import com.finance.common.utils.SecurityUtils;
import com.finance.common.utils.StringUtils;
@@ -336,7 +337,7 @@
.eq(SysUser::getUserType, UserTypeEnum.DEPARTMENT).list();
String[] userNameArr = userList.stream().map(SysUser::getAreaName)
.toArray(String[]::new);
- selectedMap.put(0, userNameArr);
+ // selectedMap.put(0, userNameArr);
// 生成下拉框的行数为部门的数量
rows = userList.size();
}
@@ -378,8 +379,8 @@
columnNo.add(String.valueOf(i));
}
excellist.add(columnNo);
- excellist.add(Lists.newArrayList(areaName, isDept ? "2024年一季度" : ""));
- // excellist.add(Lists.newArrayList(areaName, isDept ? DateUtils.getPreviousQuarter() : ""));
+ // excellist.add(Lists.newArrayList(areaName, isDept ? "2024年一季度" : ""));
+ excellist.add(Lists.newArrayList(areaName, isDept ? DateUtils.getPreviousQuarter() : ""));
return excellist;
}
--
Gitblit v1.7.1