From 2df173ba58fc2428df0b6e7b787b7313af64b71e Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 25 Jun 2024 09:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/base/mapper/MaTypeMapper.java     |  2 +-
 .../sgzb/base/service/impl/MaTypeServiceImpl.java    |  8 ++++----
 .../resources/mapper/base/MaMachineTypeMapper.xml    | 12 ++++++++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
index eb870230..6226ea31 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java
@@ -82,5 +82,5 @@ public interface MaTypeMapper {
 
     int deletePropSetByTypeId(Long typeId);
 
-    int getMaType(MaType maType);
+    MaType getMaType(MaType maType);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
index e5149efe..294c8aae 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java
@@ -72,8 +72,8 @@ public class MaTypeServiceImpl implements ITypeService {
         maType.setCreateTime(DateUtils.getNowDate());
         //根据类型名称判重
         if (maType.getTypeName() != null && maType.getParentId() != null) {
-            int num = maTypeMapper.getMaType(maType);
-            if (num > 0) {
+            MaType mapperMaType = maTypeMapper.getMaType(maType);
+            if (mapperMaType != null) {
                 throw new ServiceException("机具类型名称与库中重复，请修改后重新提交！");
             }
         }
@@ -132,8 +132,8 @@ public class MaTypeServiceImpl implements ITypeService {
         maType.setUpdateTime(DateUtils.getNowDate());
         //根据类型名称判重
         if (maType.getTypeName() != null && maType.getParentId() != null) {
-            int num = maTypeMapper.getMaType(maType);
-            if (num > 0) {
+            MaType mapperMaType = maTypeMapper.getMaType(maType);
+            if (mapperMaType != null && mapperMaType.getTypeId() != null && !mapperMaType.getTypeId().equals(maType.getTypeId())) {
                 throw new ServiceException("机具类型名称与库中重复，请修改后重新提交！");
             }
         }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
index 878c4756..61c3c189 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
@@ -416,8 +416,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    <select id="getMaType" resultType="java.lang.Integer">
-        select count(1) from ma_type where parent_id = #{parentId} and type_name = #{typeName}
+    <select id="getMaType" resultType="com.bonus.sgzb.base.api.domain.MaType">
+        SELECT
+            type_id AS typeId,
+            type_name AS typeName,
+            parent_id AS parentId
+        FROM
+            ma_type
+        WHERE
+            parent_id = #{parentId} and type_name = #{typeName}
     </select>
 
+
 </mapper>
\ No newline at end of file