From 3b0aee6db44429cd8ec4fc3c8912baf3180e35cf Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Wed, 14 Feb 2024 21:52:35 +0800
Subject: [PATCH] =?UTF-8?q?patch:=20=E6=BC=8F=E6=B4=9E=E8=A1=A5=E4=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/mapper/RoleMapper.java       |  2 +-
 .../com/jsl/oa/services/impl/RoleServiceImpl.java     | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
index 48df3bc..0baec62 100644
--- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
@@ -12,7 +12,7 @@ public interface RoleMapper {
     @Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})")
     void roleAddUser(Long uid, Long rid);
 
-    @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName}, ${display_name})")
+    @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName}, ${displayName})")
     void roleAdd(RoleDO roleDO);
 
     @Delete("delete from organize_oa.oa_role_user where uid=#{uid}")
diff --git a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
index 70092a9..5351a5c 100644
--- a/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
@@ -17,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.regex.Pattern;
 
@@ -25,12 +26,12 @@ import java.util.regex.Pattern;
  * <hr/>
  * 用于权限服务层的实现类,实现权限的增删改查,以及用户权限的获取
  *
- * @since v1.1.0
+ * @author xiao_lfeng | 176yunxuan | xiangZr-hhh
  * @version v1.1.0
  * @see com.jsl.oa.services.RoleService
  * @see com.jsl.oa.dao.RoleDAO
  * @see com.jsl.oa.dao.UserDAO
- * @author xiao_lfeng | 176yunxuan | xiangZr-hhh
+ * @since v1.1.0
  */
 @Slf4j
 @Service
@@ -171,8 +172,10 @@ public class RoleServiceImpl implements RoleService {
         String roleName = roleAddVO.getName();
         RoleDO roleDO = new RoleDO();
         if (!roleDAO.isExistRoleByRoleName(roleName)) {
-            Processing.copyProperties(roleAddVO, roleDO);
-            roleDO.setRoleName(roleAddVO.getName());
+            roleDO
+                    .setRoleName(roleAddVO.getName())
+                    .setDisplayName(roleAddVO.getDisplayName())
+                    .setCreatedAt(new Timestamp(System.currentTimeMillis()));
         } else {
             return ResultUtil.error(ErrorCode.ROLE_NAME_REPEAT);
         }