autopoi导入导出组件系列问题

导出excel实体反射，时间格式转换错误 #1573 配置groupName多生成一列导出列表数据时, 不支持合并后的单元格.提前结束列的循环了 #1426 Excel导出错误原因，value为""字符串，gitee I249JF 一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B
Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git
2025-12-08 17:12:28 +08:00 · 2020-11-18 22:40:28 +08:00 · 2020-11-14 18:31:43 +08:00 · 2020-11-14 18:30:20 +08:00 · 2020-11-11 15:47:27 +08:00 · 2020-11-11 12:59:12 +08:00
4 changed files with 4 additions and 4 deletions
--- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@ -233,7 +233,7 @@ export const JeecgListMixin = {
      if(!fileName || typeof fileName != "string"){
        fileName = "导出文件"
      }
-      let param = {...this.queryParam};
+      let param = {...this.getQueryParams()};
      if(this.selectedRowKeys && this.selectedRowKeys.length>0){
        param['selections'] = this.selectedRowKeys.join(",")
      }
--- a/jeecg-boot/jeecg-boot-base-common/pom.xml
+++ b/jeecg-boot/jeecg-boot-base-common/pom.xml
@ -243,7 +243,7 @@
 		<dependency>
 			<groupId>org.jeecgframework</groupId>
 			<artifactId>autopoi-web</artifactId>
-			<version>1.2.1</version>
+			<version>1.2.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-codec</groupId>
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
@ -2,11 +2,11 @@ package org.jeecg.modules.system.mapper;

 import java.util.List;

+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUserDepart;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

-import io.lettuce.core.dynamic.annotation.Param;

 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@ -363,7 +363,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 		//情况2：根据用户信息查询，该用户已注销
 		//update-begin---author:王帅   Date:20200601  for：if条件永远为falsebug------------
-		if (CommonConstant.DEL_FLAG_1==sysUser.getDelFlag()) {
+		if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) {
 		//update-end---author:王帅   Date:20200601  for：if条件永远为falsebug------------
 			baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null);
 			result.error500("该用户已注销");
Author	SHA1	Message	Date
zhangdaiscott	3e2f640b68	autopoi导入导出组件系列问题导出excel实体反射，时间格式转换错误 #1573 配置groupName多生成一列导出列表数据时, 不支持合并后的单元格.提前结束列的循环了 #1426 Excel导出错误原因，value为""字符串，gitee I249JF 一对多导出needMerge 子表数据对应数量小于2时报错 github#1840、gitee I1YH6B	2020-11-18 22:40:28 +08:00
zhangdaiscott	bf6c5f4623	Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git	2020-11-14 18:31:43 +08:00
zhangdaiscott	df259385ec	jeecgboot-mysql-5.7.sql被别人提交导致不完整 #1985	2020-11-14 18:30:20 +08:00
JEECG开源社区	c5f51a17da	Merge pull request #1966 from tank99tank/no_query_params 导出参数没有高级查询参数	2020-11-11 15:47:27 +08:00
tank99tank	ccf4946b70	导出参数没有高级查询参数 #1860	2020-11-11 12:59:12 +08:00
JEECG开源社区	3b4a65ba04	Merge pull request #1731 from CharlieJ0hn/master 修改 qutz_ 前缀的表名为大写，用于修复 jeecg 项目中 Qrutz 表名不区分大小写在 Linux 和 Mac 上的报错	2020-11-10 15:13:07 +08:00
JEECG开源社区	3a8ae4c089	Merge pull request #1900 from Pa-Star-Home/master bugfix: fix mybatis param import error; fix integer object compare use == error	2020-11-10 15:05:20 +08:00
weiyouchen	63048d8c64	bugfix: fix mybatis param import error; fix integer object compare use == error	2020-10-27 15:49:27 +08:00
晨越	8775472470	Update jeecgboot-mysql-5.7.sql 修改 qutz_ 前缀的表名为大写，用于修复 jeecg 项目中 Qrutz 表名不区分大小写在 Linux 和 Mac 上的报错	2020-09-14 15:22:41 +08:00