From 5138dde226b11176bc8b59784d3a232f6eb219a2 Mon Sep 17 00:00:00 2001
From: yu <tianyu414x@126.com>
Date: Tue, 22 Oct 2024 16:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/das/modules/auth/controller/SysMenusController.java | 6 ++++++
 .../das/modules/equipment/controller/SysEnumController.java | 2 +-
 .../das/modules/equipment/domain/vo/SysEnumValuesVo.java    | 4 ++++
 das/src/main/resources/mapper/SysEnumValuesMapper.xml       | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
index 4119a42f..75bd2071 100644
--- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
+++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
@@ -41,6 +41,9 @@ public class SysMenusController {
         if(!hasPermission){
             return R.fail("没有系统管理权限");
         }
+        if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){
+            return R.fail("菜单名称,必须为英文");
+        }
         return R.success(sysMenuService.createMenu(sysMenuDto));
     }
 
@@ -55,6 +58,9 @@ public class SysMenusController {
         if(!hasPermission){
             return R.fail("没有系统管理权限");
         }
+        if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){
+            return R.fail("菜单名称,必须为英文");
+        }
         sysMenuService.updateMenu(sysMenuDto);
         return R.success();
     }
diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
index a9dd9816..dda36d3f 100644
--- a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
+++ b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
@@ -89,7 +89,7 @@ public class SysEnumController {
     }
 
     /**
-     * 查询枚举类型列表
+     * 查询枚举值列表
      *
      * */
     @PostMapping("/queryEnumValuesList")
diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
index 836102ad..ff847d10 100644
--- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
+++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEnumValuesVo.java
@@ -19,6 +19,10 @@ public class SysEnumValuesVo {
      * 关联到枚举类型表的ID
      */
     private Long enumTypeId;
+    /**
+     * 关联到枚举类型表的ID字符串类型
+     */
+    private String enumTypeIdStr;
 
     /**
      * 枚举值的具体内容
diff --git a/das/src/main/resources/mapper/SysEnumValuesMapper.xml b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
index 3fdb084f..e950eda3 100644
--- a/das/src/main/resources/mapper/SysEnumValuesMapper.xml
+++ b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
@@ -4,6 +4,7 @@
 
     <resultMap type="com.das.modules.equipment.domain.vo.SysEnumValuesVo" id="EnumValuesMap">
         <result property="enumTypeId" column="enum_type_id" jdbcType="BIGINT"/>
+        <result property="enumTypeIdStr" column="enum_type_id" jdbcType="VARCHAR"/>
         <result property="value" column="value" jdbcType="VARCHAR"/>
         <result property="description" column="description" jdbcType="VARCHAR"/>
         <result property="orderNumber" column="order_number" jdbcType="INTEGER"/>