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, 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 void setCreateAndUpdatInfo(T entity) { + public static 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) {