hubin 1 жил өмнө
parent
commit
b9da98c51a

+ 7 - 2
aizuda-service-parent/src/main/java/com/aizuda/service/web/AizudaMetaObjectHandler.java

@@ -5,6 +5,7 @@
  */
 package com.aizuda.service.web;
 
+import com.aizuda.service.spring.SpringHelper;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
@@ -16,7 +17,7 @@ public class AizudaMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
-        UserSession userSession = UserSession.getLoginInfo();
+        UserSession userSession = this.getLoginInfoOrNull();
         if (null != userSession) {
             this.fillHasGetter(metaObject, "createId", userSession.getId());
             this.fillHasGetter(metaObject, "createBy", userSession.getUsername());
@@ -26,13 +27,17 @@ public class AizudaMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        UserSession userSession = UserSession.getLoginInfo();
+        UserSession userSession = this.getLoginInfoOrNull();
         if (null != userSession) {
             this.fillHasGetter(metaObject, "updateBy", userSession.getUsername());
         }
         this.fillHasGetter(metaObject, "updateTime", new Date());
     }
 
+    public static UserSession getLoginInfoOrNull() {
+        return UserSession.getLoginInfo(SpringHelper.getCurrentRequest(), true);
+    }
+
     protected void fillHasGetter(MetaObject metaObject, String fieldName, Object fieldVal) {
         if (metaObject.hasGetter(fieldName)) {
             this.fillStrategy(metaObject, fieldName, fieldVal);