From 70bf1a48d037f993021ddf4ee2ee6da3bbce351e Mon Sep 17 00:00:00 2001
From: 司猫子 <songshuang@qq.com>
Date: 星期日, 04 二月 2024 09:51:52 +0800
Subject: [PATCH] !481 单元格合并可以基于注解选择哪些其他字段需要同时相等方可进行该单元格合并 * excel插件 原有的合并策略写死了根据前一字段是否一致来判断后一字段的合并 感觉这样不灵活 如有特殊需求 字段排序不规整 于是扩充了注解的…
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
index 63653de..a66908f 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
@@ -29,16 +29,17 @@
? baseEntity.getCreateTime() : new Date();
baseEntity.setCreateTime(current);
baseEntity.setUpdateTime(current);
- LoginUser loginUser = getLoginUser();
- if (ObjectUtil.isNotNull(loginUser)) {
- Long userId = ObjectUtil.isNotNull(baseEntity.getCreateBy())
- ? baseEntity.getCreateBy() : loginUser.getUserId();
- // 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
- baseEntity.setCreateBy(userId);
- // 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
- baseEntity.setUpdateBy(userId);
- baseEntity.setCreateDept(ObjectUtil.isNotNull(baseEntity.getCreateDept())
- ? baseEntity.getCreateDept() : loginUser.getDeptId());
+ if (ObjectUtil.isNull(baseEntity.getCreateBy())) {
+ LoginUser loginUser = getLoginUser();
+ if (ObjectUtil.isNotNull(loginUser)) {
+ Long userId = loginUser.getUserId();
+ // 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
+ baseEntity.setCreateBy(userId);
+ // 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
+ baseEntity.setUpdateBy(userId);
+ baseEntity.setCreateDept(ObjectUtil.isNotNull(baseEntity.getCreateDept())
+ ? baseEntity.getCreateDept() : loginUser.getDeptId());
+ }
}
}
} catch (Exception e) {
@@ -53,11 +54,12 @@
Date current = new Date();
// 鏇存柊鏃堕棿濉厖(涓嶇涓轰笉涓虹┖)
baseEntity.setUpdateTime(current);
- LoginUser loginUser = getLoginUser();
// 褰撳墠宸茬櫥褰� 鏇存柊浜哄～鍏�(涓嶇涓轰笉涓虹┖)
- if (ObjectUtil.isNotNull(loginUser)) {
- baseEntity.setUpdateBy(loginUser.getUserId());
+ Long userId = LoginHelper.getUserId();
+ if (ObjectUtil.isNotNull(userId)) {
+ baseEntity.setUpdateBy(userId);
}
+
}
} catch (Exception e) {
throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
--
Gitblit v1.9.3