From 7694dd824202ce3c100ffb05bab3cdde292c27fd Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Fri, 24 Mar 2023 11:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java | 5 +++--
 .../java/com/cnbm/admin/service/impl/SysUserServiceImpl.java | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java b/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java
index 0ac8c05..ae553db 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java
@@ -21,6 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -90,7 +91,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
         //保存角色
-        BaseSupportUtils.setCommonField(entity);
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        entity.setCreateDate(timestamp);
         insert(entity);
 
         //保存角色菜单关系
@@ -106,7 +108,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
         //更新角色
-        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
 
         //更新角色菜单关系
diff --git a/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java b/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java
index a38bf6b..513612a 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -99,7 +100,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
         //保存用户
         entity.setSuperAdmin(SuperAdminEnum.NO.value());
-        BaseSupportUtils.setCommonField(entity);
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        entity.setCreateDate(timestamp);
         insert(entity);
 
         //保存角色用户关系
@@ -120,7 +122,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         }
 
         //更新用户
-        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
 
         //更新角色用户关系
-- 
2.45.2