From 2a3bd87a287b19b925570f932caf71e15dd512dc Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 18 Dec 2025 15:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A8=A1=E6=9D=BF=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8D=E5=90=8D=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/account/dto/RoleTemplateDTO.java   | 9 +++------
 .../service/account/service/impl/SysRoleServiceImpl.java | 3 +--
 .../account/service/impl/SysRoleTemplateServiceImpl.java | 9 +++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java
index 5c3ddf070..739aa8cb5 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java
@@ -1,14 +1,11 @@
 package com.czg.account.dto;
 
-import com.mybatisflex.annotation.Column;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
+/**
+ * @author ww
+ */
 @Data
 public class RoleTemplateDTO {
     private Integer id;
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
index 5ce6cbd0e..3b22c8a9b 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java
@@ -273,8 +273,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         long roleCount;
         if (role.getShopId() == null) {
-            roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId())
-                    .isNull(SysRole::getShopId).count();
+            roleCount = 0;
         } else {
             roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId())
                     .eq(SysRole::getShopId, StpKit.USER.getShopId()).count();
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 ee1b5e6b9..18cb8400c 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
@@ -4,6 +4,7 @@ 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.exception.CzgException;
 import com.czg.sa.StpKit;
 import com.czg.service.account.mapper.SysRoleTemplateMapper;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -34,6 +35,10 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
         SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList");
         roleTemplate.setOpUser(StpKit.USER.getAccount());
         if (roleTemplate.getPid() != null) {
+            boolean exists = exists(query().eq(SysRoleTemplate::getPid, roleTemplate.getPid()).eq(SysRoleTemplate::getName, roleTemplate.getName()));
+            if (exists) {
+                throw new CzgException("添加失败，该模板下已存在同名角色");
+            }
             SysRole sysRole = new SysRole().setName(roleTemplate.getName()).setCreateUserId(StpKit.USER.getShopId());
             roleService.save(sysRole);
             roleTemplate.setRoleId(sysRole.getId());
@@ -80,6 +85,10 @@ public class SysRoleTemplateServiceImpl extends ServiceImpl<SysRoleTemplateMappe
     @Override
     public Boolean editInfo(RoleTemplateDTO dto) {
         SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class);
+        boolean exists = exists(query().eq(SysRoleTemplate::getPid, roleTemplate.getPid()).eq(SysRoleTemplate::getName, roleTemplate.getName()).ne(SysRoleTemplate::getId, roleTemplate.getId()));
+        if (exists) {
+            throw new CzgException("添加失败，已存在同名模板");
+        }
         roleTemplate.setOpUser(StpKit.USER.getAccount());
         roleTemplate.setOpSysUserId(StpKit.USER.getLoginIdAsLong());
         return updateById(roleTemplate);