From 805cb952d8a89d4e2d0310dc7f0362c4ccbef068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Wed, 15 Jun 2022 16:41:25 +0800
Subject: [PATCH] fix bug

---
 .../dictionary/controller/ArchivesTypeController.java |  7 +++++++
 .../service/impl/ArchivesDictionaryImpl.java          | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
index 5ab3ab9..8548763 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
@@ -19,6 +19,7 @@ import com.storeroom.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -120,6 +121,9 @@ public class ArchivesTypeController {
     @AnonymousPutMapping("update")
     public ApiResponse<Object> updateDic(@RequestBody ArchivesDictionaryDTO arcdicDto) {
         if (!StringUtils.isEmpty(arcdicDto.getId())) {
+            if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) {
+                arcdicDto.setDictionaryConfigId(null);
+            }
             archivesDictionaryService.update(arcdicDto);
             return ApiResponse.success(ResponseStatus.SUCCESS);
         }
@@ -138,6 +142,9 @@ public class ArchivesTypeController {
         if (StringUtils.isEmpty(arcdicDto.getIsDataTypeDetails())) {
             throw new BaseException("数据类型不能为空");
         }
+        if (StringUtils.isEmpty(arcdicDto.getDictionaryConfigId().getId()) || arcdicDto.getDictionaryConfigId().getId().equals("null")) {
+            arcdicDto.setDictionaryConfigId(null);
+        }
         archivesDictionaryService.create(arcdicDto);
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java
index 592deb7..a5b91af 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java
@@ -33,7 +33,6 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
             ArchivesDictionary a = archivesDictionaryMapper.toEntity(o);
             a.setId(NanoIdUtils.randomNanoId());
-            // archivesDictionaryRepository.save(a);
             list1.add(a);
         }
         archivesDictionaryRepository.saveAll(list1);
@@ -92,22 +91,26 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
     }
 
     @Override
+    @Transactional
     public void create(ArchivesDictionaryDTO arcdicDto) {
         ArchivesDictionary arc = archivesDictionaryMapper.toEntity(arcdicDto);
         List<ArchivesDictionary> arc1 = archivesDictionaryRepository.querybyName(arc.getFieldName(), arc.getFieldCnName());
         if (arc1.size() == 0) {
-            arcdicDto.setId(NanoIdUtils.randomNanoId());
-            archivesDictionaryRepository.save(archivesDictionaryMapper.toEntity(arcdicDto));
+            arc.setId(NanoIdUtils.randomNanoId());
+            archivesDictionaryRepository.save(arc);
+        }else {
+            throw new BaseException("字段名称不能重复");
         }
-        throw new BaseException("字段名称不能重复");
     }
 
     @Override
+    @Transactional
     public void delete(String id) {
         archivesDictionaryRepository.deleteById(id);
     }
 
     @Override
+    @Transactional
     public void upSort(List<ArchivesDictionarySmallDTO> archivesDictionaryDTO) {
         List<ArchivesDictionary> list = new ArrayList<>();
         for (ArchivesDictionarySmallDTO ar : archivesDictionaryDTO) {