From 6e67e1a8496e2a00ebbb55fd1b01e25f1d2c8713 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 14:38:21 +0800
Subject: [PATCH] fix 修复 多数据源aop语法错误
---
ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index 83c0d22..6d9d56a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -1,10 +1,9 @@
package com.ruoyi.framework.mybatisplus;
-import cn.hutool.core.lang.Validator;
import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
@@ -25,35 +24,28 @@
try {
//鏍规嵁灞炴�у悕瀛楄缃濉厖鐨勫��
if (metaObject.hasGetter("createTime")) {
- if (Validator.isEmpty(metaObject.getValue("createTime"))) {
- this.setFieldValByName("createTime", new Date(), metaObject);
- }
+ this.setFieldValByName("createTime", new Date(), metaObject);
}
if (metaObject.hasGetter("createBy")) {
- if (Validator.isEmpty(metaObject.getValue("createBy"))) {
- this.setFieldValByName("createBy", getLoginUsername(), metaObject);
- }
+ this.setFieldValByName("createBy", getLoginUsername(), metaObject);
}
} catch (Exception e) {
- throw new CustomException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+ throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
}
+ updateFill(metaObject);
}
@Override
public void updateFill(MetaObject metaObject) {
try {
if (metaObject.hasGetter("updateBy")) {
- if (Validator.isEmpty(metaObject.getValue("updateBy"))) {
- this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
- }
+ this.setFieldValByName("updateBy", getLoginUsername(), metaObject);
}
if (metaObject.hasGetter("updateTime")) {
- if (Validator.isEmpty(metaObject.getValue("updateTime"))) {
- this.setFieldValByName("updateTime", new Date(), metaObject);
- }
+ this.setFieldValByName("updateTime", new Date(), metaObject);
}
} catch (Exception e) {
- throw new CustomException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+ throw new ServiceException("鑷姩娉ㄥ叆寮傚父 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
}
}
@@ -61,14 +53,14 @@
* 鑾峰彇鐧诲綍鐢ㄦ埛鍚�
*/
private String getLoginUsername() {
- LoginUser loginUser;
+ SysUser loginUser;
try {
- loginUser = SecurityUtils.getLoginUser();
+ loginUser = SecurityUtils.getUser();
} catch (Exception e) {
log.warn("鑷姩娉ㄥ叆璀﹀憡 => 鐢ㄦ埛鏈櫥褰�");
return null;
}
- return loginUser.getUsername();
+ return loginUser.getUserName();
}
}
--
Gitblit v1.9.3