From f9d41a3404c265eb045903b6f9289b91cb86c17e Mon Sep 17 00:00:00 2001
From: xiayebo <364530740@qq.com>
Date: Tue, 13 Jan 2026 17:38:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegen/service/impl/FunItemServiceImpl.java    | 13 +++++++++++++
 .../service/impl/FunOperationServiceImpl.java       | 12 ++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java
index 6b5560e..440c767 100644
--- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java
+++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java
@@ -88,6 +88,19 @@ public class FunItemServiceImpl implements FunItemService {
         if (funItemMapper.selectCountByQuery(queryItem) > 0) {
             return XResult.failed("功能ID已存在");
         }
+        // 同模块中 功能编码要唯一
+        if (StrUtil.isNotBlank(req.getItemCode())) {
+            QueryWrapper queryItemCode = new QueryWrapper();
+            queryItemCode.eq(FunItemEntity::getModuleId, req.getModuleId());
+            queryItemCode.eq(FunItemEntity::getItemCode, req.getItemCode());
+            if (req.getId() != null) {
+                queryItemCode.ne(FunItemEntity::getId, req.getId());
+            }
+            if (funItemMapper.selectCountByQuery(queryItemCode) > 0) {
+                return XResult.failed("同模块中功能编码已存在");
+            }
+        }
+
         FunItemEntity funItemEntity = new FunItemEntity();
         BeanUtils.copyProperties(req, funItemEntity);
         funItemEntity.setId(id);
diff --git a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java
index 799040a..0b1c827 100644
--- a/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java
+++ b/src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java
@@ -97,6 +97,18 @@ public class FunOperationServiceImpl implements FunOperationService {
         if (funOperationMapper.selectCountByQuery(queryOperation) > 0) {
             return XResult.failed("操作ID已存在");
         }
+
+        // 同模块 同功能中 操作编码不能重复
+        QueryWrapper queryOperationCode = new QueryWrapper();
+        queryOperationCode.eq(FunOperationEntity::getModuleId, req.getModuleId());
+        queryOperationCode.eq(FunOperationEntity::getItemId, req.getItemId());
+        queryOperationCode.eq(FunOperationEntity::getOperationCode, req.getOperationCode());
+        if (req.getId() != null) {
+            queryOperationCode.ne(FunItemEntity::getId, req.getId());
+        }
+        if (funOperationMapper.selectCountByQuery(queryOperationCode) > 0) {
+            return XResult.failed("同模块同功能中操作编码已存在");
+        }
         FunOperationEntity funOperationEntity = new FunOperationEntity();
         BeanUtils.copyProperties(req, funOperationEntity);
         funOperationEntity.setId(id);