From d21773b0d86197d133ef4b16fe366232c345c665 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期三, 19 六月 2024 23:02:50 +0800
Subject: [PATCH] 报表添加

---
 project-framework/src/main/java/com/project/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java |   89 ++++++++++++++++++++++++++++----------------
 1 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/project-framework/src/main/java/com/project/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java b/project-framework/src/main/java/com/project/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
index db4cc73..75c4e3d 100644
--- a/project-framework/src/main/java/com/project/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
+++ b/project-framework/src/main/java/com/project/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
@@ -1,6 +1,7 @@
 package com.project.framework.mybatisplus;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.project.common.core.domain.model.LoginUser;
 import com.project.common.utils.SecurityUtils;
 import com.project.common.utils.StringUtils;
 import org.apache.ibatis.reflection.MetaObject;
@@ -18,45 +19,67 @@
 		String createBy = (String) this.getFieldValByName("createBy", metaObject);
 		Object createTime = this.getFieldValByName("createTime", metaObject);
 		if (StringUtils.isEmpty(createBy)) {
-			createBy = SecurityUtils.getLoginUser().getUser().getNickName();
+			LoginUser loginUser;
+			try {
+				loginUser = SecurityUtils.getLoginUser();
+			} catch (Exception e){
+				loginUser = null;
+			}
+
+			if (loginUser == null) {
+				createBy = "绯荤粺鎿嶄綔";
+			} else {
+				createBy = loginUser.getUser().getNickName();
+			}
 			this.setFieldValByName("createBy", createBy, metaObject);
 		}
-		if (createTime == null) {
-			createTime = new Date();
-			this.setFieldValByName("createTime", createTime, metaObject);
+			if (createTime == null) {
+				createTime = new Date();
+				this.setFieldValByName("createTime", createTime, metaObject);
+			}
+			//endregion
+			//region 澶勭悊淇敼浜轰俊鎭�
+			Object updateBy = this.getFieldValByName("updateBy", metaObject);
+			Object updateTime = this.getFieldValByName("updateTime", metaObject);
+			if (updateBy == null) {
+				updateBy = createBy;
+				this.setFieldValByName("updateBy", updateBy, metaObject);
+			}
+			if (updateTime == null) {
+				updateTime = createTime;
+				this.setFieldValByName("updateTime", updateTime, metaObject);
+			}
+			//endregion
 		}
-		//endregion
-		//region 澶勭悊淇敼浜轰俊鎭�
-		Object updateBy = this.getFieldValByName("updateBy", metaObject);
-		Object updateTime = this.getFieldValByName("updateTime", metaObject);
-		if (updateBy == null) {
-			updateBy = createBy;
+
+		@Override
+		public void updateFill(MetaObject metaObject) {
+			//region 澶勭悊淇敼浜轰俊鎭�
+			String updateBy;
+			LoginUser loginUser;
+			try {
+				loginUser = SecurityUtils.getLoginUser();
+			} catch (Exception e){
+				loginUser = null;
+			}
+			if (loginUser==null){
+				updateBy = "绯荤粺鎿嶄綔";
+			} else {
+				updateBy = loginUser.getUser().getNickName();
+			}
 			this.setFieldValByName("updateBy", updateBy, metaObject);
-		}
-		if (updateTime == null) {
-			updateTime = createTime;
+			Date updateTime = new Date();
 			this.setFieldValByName("updateTime", updateTime, metaObject);
+			//endregion
 		}
-		//endregion
-	}
 
-	@Override
-	public void updateFill(MetaObject metaObject) {
-		//region 澶勭悊淇敼浜轰俊鎭�
-		String updateBy = SecurityUtils.getLoginUser().getUser().getNickName();
-		this.setFieldValByName("updateBy", updateBy, metaObject);
-		Date updateTime = new Date();
-		this.setFieldValByName("updateTime", updateTime, metaObject);
-		//endregion
-	}
+		@Override
+		public boolean openInsertFill() {
+			return true;
+		}
 
-	@Override
-	public boolean openInsertFill() {
-		return true;
-	}
-
-	@Override
-	public boolean openUpdateFill() {
-		return true;
-	}
+		@Override
+		public boolean openUpdateFill() {
+			return true;
+		}
 }

--
Gitblit v1.9.1