From 7b1f0f2291c8788629f00e24367e4bd305ea7072 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 30 Dec 2024 17:58:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archives/mapper/ArchivesMapper.java       |  7 ++++++
 .../service/impl/ArchivesServiceImpl.java     |  3 ++-
 .../material/Archives/ArchivesMapper.xml      | 25 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java
index eae763b0..e2be8ae7 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java
@@ -96,4 +96,11 @@ public interface ArchivesMapper {
      * @return
      */
     List<ArchivesDetails> selectDetails(@Param("list") List<Long> detailsIdList);
+
+    /**
+     * 根据名称查询电子档案右侧详情
+     * @param archivesDetails
+     * @return
+     */
+    ArchivesDetails selectDetailsUpdateName(ArchivesDetails archivesDetails);
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java
index 1e043fbc..51245164 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java
@@ -224,7 +224,8 @@ public class ArchivesServiceImpl implements ArchivesService {
     @Override
     public AjaxResult updateDetails(ArchivesDetails archivesDetails) {
         // 根据类型名称和上级id查询，同级下名称不能重复
-        if (isNameDuplicate(archivesDetails)) {
+        ArchivesDetails info = archivesMapper.selectDetailsUpdateName(archivesDetails);
+        if (info != null && !info.getDetailsId().equals(archivesDetails.getDetailsId())) {
             return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());
         }
         archivesDetails.setUpdateBy(SecurityUtils.getUsername());
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml
index 908d1842..9ab92627 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml
@@ -131,6 +131,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="selectDetailsUpdateName" resultType="com.bonus.material.archives.domain.ArchivesDetails">
+        select
+        details_id as detailsId,
+        info_id as infoId,
+        doc_name as docName,
+        doc_type as docType,
+        doc_url as docUrl,
+        doc_size as docSize,
+        type_id as typeId,
+        YEAR(create_time) as year,
+        create_by as createBy,
+        create_time as createTime,
+        update_by as updateBy,
+        update_time as updateTime
+        FROM
+        archives_record_details
+        WHERE
+        del_flag = '0'
+        and doc_name = #{docName}
+        <if test="parentId != null">
+            and parent_id = #{parentId}
+        </if>
+    </select>
+
     <insert id="insertInfo">
         insert into archives_record_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -197,7 +221,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDetails">
         update archives_record_details
         <trim prefix="SET" suffixOverrides=",">
-            <if test="infoId != null">info_id = #{infoId},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="docName != null and docName != ''">doc_name = #{docName},</if>
             <if test="docType != null and docType != ''">doc_type = #{docType},</if>