From a1431c5cb198c42d8830969a9a35710fddbc92c0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 17 十一月 2022 17:33:32 +0800
Subject: [PATCH] !251 add 新增字典数据映射注解，根据字段数据（sys_dict_data表）.dict_type 的 value 映射对应的 label Merge pull request !251 from itino/dev-itino
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
index 8105186..6d7c977 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
@@ -27,26 +27,16 @@
try {
if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) metaObject.getOriginalObject();
- Date current = new Date();
- // 鍒涘缓鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getCreateTime())) {
- baseEntity.setCreateTime(current);
- }
- // 鏇存柊鏃堕棿涓虹┖ 鍒欏～鍏�
- if (ObjectUtil.isNull(baseEntity.getUpdateTime())) {
- baseEntity.setUpdateTime(current);
- }
- String username = getLoginUsername();
+ Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime())
+ ? baseEntity.getCreateTime() : new Date();
+ baseEntity.setCreateTime(current);
+ baseEntity.setUpdateTime(current);
+ String username = StringUtils.isNotBlank(baseEntity.getCreateBy())
+ ? baseEntity.getCreateBy() : getLoginUsername();
// 褰撳墠宸茬櫥褰� 涓� 鍒涘缓浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getCreateBy())) {
- baseEntity.setCreateBy(username);
- }
+ baseEntity.setCreateBy(username);
// 褰撳墠宸茬櫥褰� 涓� 鏇存柊浜轰负绌� 鍒欏～鍏�
- if (StringUtils.isNotBlank(username)
- && StringUtils.isBlank(baseEntity.getUpdateBy())) {
- baseEntity.setUpdateBy(username);
- }
+ baseEntity.setUpdateBy(username);
}
} catch (Exception e) {
throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
--
Gitblit v1.9.3