From 95073743b4c1afcaa771317155ace38b69ceffa4 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Fri, 7 Dec 2018 22:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/web/base/AbstractBaseServiceImpl.java  |  4 ++--
 .../com/ruoyi/framework/web/util/EntityUtils.java    | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
index f165c2178..92bf2a7ea 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/base/AbstractBaseServiceImpl.java
@@ -58,14 +58,14 @@ public abstract class AbstractBaseServiceImpl<M extends MyMapper<T>, T> implemen
 
     @Override
     public int insert(T entity) {
-        EntityUtils.setCreateAndUpdatInfo(entity);
+        EntityUtils.setCreateAndUpdateInfo(entity);
         return mapper.insert(entity);
     }
 
 
     @Override
     public int insertSelective(T entity) {
-        EntityUtils.setCreateAndUpdatInfo(entity);
+        EntityUtils.setUpdatedInfo(entity);
         return  mapper.insertSelective(entity);
     }
 
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
index c7c7a6479..a4e9b7331 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/util/EntityUtils.java
@@ -1,8 +1,10 @@
 package com.ruoyi.framework.web.util;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 
 import java.lang.reflect.Method;
+import java.util.Date;
 
 
 /**
@@ -21,7 +23,7 @@ public class EntityUtils {
      * @param entity 实体bean
      * @author 王浩彬
      */
-    public static <T> void setCreateAndUpdatInfo(T entity) {
+    public static <T> void setCreateAndUpdateInfo(T entity) {
         setCreateInfo( entity );
         setUpdatedInfo( entity );
     }
@@ -37,7 +39,9 @@ public class EntityUtils {
             Method[] methods = entity.getClass().getMethods();
             for (Method m : methods) {
                 if (m.getName().equals( "setCreateBy" )) {
-                    m.invoke( entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId() );
+                    m.invoke( entity, StrUtil.toString( com.ruoyi.framework.web.util.ShiroUtils.getUserId()) );
+                } else if (m.getName().equals( "setCreateDate" )) {
+                    m.invoke( entity, new Date() );
                 } else if (m.getName().equals( "setId" )) {
                     m.invoke( entity, RandomUtil.randomUUID() );
                 }
@@ -60,7 +64,9 @@ public class EntityUtils {
             Method[] methods = entity.getClass().getMethods();
             for (Method m : methods) {
                 if (m.getName().equals( "setUpdateBy" )) {
-                    m.invoke( entity, com.ruoyi.framework.web.util.ShiroUtils.getUserId() );
+                    m.invoke( entity, StrUtil.toString( com.ruoyi.framework.web.util.ShiroUtils.getUserId()  ));
+                } else if (m.getName().equals( "setUpdateDate" )) {
+                    m.invoke( entity, new Date() );
                 }
             }
         } catch (Exception e) {