From 67d83e83c2db3c39ef13a8432a116e8e6a8615f6 Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Thu, 18 Dec 2025 14:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devConfig/controller/EquipmentPropertyController.java     | 4 ++--
 .../material/devConfig/mapper/EquipmentPropertyMapper.java    | 2 +-
 .../devConfig/service/impl/EquipmentPropertyServiceImpl.java  | 2 +-
 .../mapper/material/devConfig/EquipmentPropertyMapper.xml     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
index 8bc0efa..f1c00c9 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/controller/EquipmentPropertyController.java
@@ -97,7 +97,7 @@ public class EquipmentPropertyController {
     /**
      * 新增特征值
      */
-    @PostMapping
+    @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody EquipmentProperty equipmentProperty) {
         equipmentPropertyService.add(equipmentProperty);
         return AjaxResult.success();
@@ -106,7 +106,7 @@ public class EquipmentPropertyController {
     /**
      * 修改特征值
      */
-    @PutMapping
+    @PutMapping("/update")
     public AjaxResult update(@Validated @RequestBody EquipmentProperty equipmentProperty) {
         equipmentPropertyService.update(equipmentProperty);
         return AjaxResult.success();
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
index 00824e7..9bb18d4 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/mapper/EquipmentPropertyMapper.java
@@ -17,7 +17,7 @@ public interface EquipmentPropertyMapper {
     void insert(EquipmentProperty equipmentProperty);
 
 
-    EquipmentProperty getByPropertyName(@Param("propertyName") String propertyName);
+    EquipmentProperty getByPropertyName(EquipmentProperty equipmentProperty);
     void updateById(EquipmentProperty equipmentProperty);
 
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
index 33a2604..16a3377 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devConfig/service/impl/EquipmentPropertyServiceImpl.java
@@ -51,7 +51,7 @@ public class EquipmentPropertyServiceImpl implements EquipmentPropertyService {
 
 
         // 1. 根据 property_name 查询是否已存在记录
-        EquipmentProperty existingProperty = equipmentPropertyMapper.getByPropertyName(equipmentProperty.getPropertyName());
+        EquipmentProperty existingProperty = equipmentPropertyMapper.getByPropertyName(equipmentProperty);
 
         if (existingProperty != null) {
             // 2. 若存在，合并 property_value（用逗号分隔）
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
index 2e8be80..341c66f 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devConfig/EquipmentPropertyMapper.xml
@@ -250,7 +250,7 @@
 
     <!-- 根据 propertyName 查询记录 -->
     <select id="getByPropertyName" resultType="com.bonus.material.devConfig.domain.EquipmentProperty">
-        SELECT * FROM ma_type_properties WHERE property_name = #{propertyName}
+        SELECT * FROM ma_type_properties WHERE property_name = #{propertyName} and type_id=#{typeId}
     </select>
 
     <!-- 更新记录 -->