From b28f2557b3b29aabc5ca3ab3d0349c2983dec387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 11:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/account/entity/SysRole.java       | 2 ++
 .../main/java/com/czg/market/entity/SysRoleTemplate.java    | 2 +-
 .../account/service/impl/SysRoleTemplateServiceImpl.java    | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java
index da1d905e2..cbe422399 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SysRole.java
@@ -7,6 +7,7 @@ import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -23,6 +24,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_role")
+@Accessors(chain = true)
 public class SysRole implements Serializable {
 
     @Serial
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java
index 44fc947b4..4dcb99254 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java
@@ -69,7 +69,7 @@ public class SysRoleTemplate implements Serializable {
     /**
      * 角色id列表
      */
-    private String roleId;
+    private Long roleId;
 
     /**
      * 上级id
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
index e5bacd3c6..3a3d50097 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleTemplateServiceImpl.java
@@ -2,6 +2,7 @@ package com.czg.service.account.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.czg.account.dto.RoleTemplateDTO;
+import com.czg.account.entity.SysRole;
 import com.czg.account.service.SysRoleService;
 import com.czg.sa.StpKit;
 import com.czg.service.account.mapper.SysRoleTemplateMapper;
@@ -29,6 +30,11 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
     public Boolean saveInfo(RoleTemplateDTO dto) {
         SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList");
         roleTemplate.setOpUser(StpKit.USER.getAccount());
+        if (roleTemplate.getPid() != null) {
+            SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getLoginIdAsLong());
+            roleService.save(sysRole);
+            roleTemplate.setRoleId(sysRole.getId());
+        }
         roleTemplate.setOpSysUserId(StpKit.USER.getLoginIdAsLong());
         return save(roleTemplate);
     }