fix bug

archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java

@@ -30,10 +30,10 @@ public class ArchivesDictrionaryController {
 
 
     @ApiOperation("获取隐藏状态字典")
-    @AnonymousGetMapping("isdispaly")
-    public ApiResponse<Object> getIsDisPlayState(@RequestParam Boolean isDisPlayState) {
+    @AnonymousGetMapping("is-dispaly")
+    public ApiResponse<Object> getIsDisPlayState(@RequestParam Boolean isDisPlayState,@RequestParam String categoryId) {
         if (isDisPlayState != null) {
-            return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState));
+            return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState,categoryId));
         }
         throw new BaseException("状态异常");
     }

archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSortController.java

@@ -25,13 +25,22 @@ public class ArchivesListSortController {
     private final ArchivesDictionaryService archivesDictionaryService;
 
 
-
     @ApiOperation("修改queue序列排序")
     @AnonymousPutMapping("update-queue")
     public ApiResponse<Object> updateArcQueue(@RequestBody Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS) {
         if (archivesDisplaySmallDTOS.size() != 0 && archivesDisplaySmallDTOS.size() > 1) {
-                archivesDictionaryService.updateQueue(archivesDisplaySmallDTOS);
-                return ApiResponse.success(ResponseStatus.SUCCESS);
+            archivesDictionaryService.updateQueue(archivesDisplaySmallDTOS);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
+        }
+        throw new BaseException("数据异常");
+    }
+
+    @ApiOperation("升序降序")
+    @AnonymousPutMapping("orderby")
+    public ApiResponse<Object> updateOrderBy(@RequestBody Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS) {
+        if (archivesDisplaySmallDTOS.size() != 0) {
+            archivesDictionaryService.updateOrderBy(archivesDisplaySmallDTOS);
+            return ApiResponse.success(ResponseStatus.SUCCESS);
         }
         throw new BaseException("数据异常");
     }

archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java

@@ -62,7 +62,7 @@ public interface ArchivesDictionaryRepository extends JpaRepository<ArchivesDict
      * @param state
      * @return
      */
-    List<ArchivesDictionary> findByIsDisplay(Boolean state);
+    List<ArchivesDictionary> findByIsDisplayAndCategoryId(Boolean state,String categoryId);
 
 
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java

@@ -75,7 +75,7 @@ public interface ArchivesDictionaryService {
      * @param isDisPlayState
      * @return
      */
-    List<ArchivesDictionaryDTO> getIsDisPlayState(Boolean isDisPlayState);
+    List<ArchivesDictionaryDTO> getIsDisPlayState(Boolean isDisPlayState,String categoryId);
 
 
     /**
@@ -98,5 +98,9 @@ public interface ArchivesDictionaryService {
      */
     void updateQueue(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO);
 
-
+    /**
+     * 修改升序降序状态
+     * @param archivesDisplaySmallDTOS
+     */
+    void updateOrderBy(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS);
 }

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java

@@ -110,6 +110,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
         List<ArchivesDictionary> arc1 = archivesDictionaryRepository.querybyName(arc.getFieldName(), arc.getFieldCnName());
         if (arc1.size() == 0) {
             arc.setId(NanoIdUtils.randomNanoId());
+            arc.setIsInput(true);
             archivesDictionaryRepository.save(arc);
         } else {
             throw new BaseException("字段名称不能重复");
@@ -151,8 +152,8 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
     }
 
     @Override
-    public List<ArchivesDictionaryDTO> getIsDisPlayState(Boolean isDisPlayState) {
-        List<ArchivesDictionary> list = archivesDictionaryRepository.findByIsDisplay(isDisPlayState);
+    public List<ArchivesDictionaryDTO> getIsDisPlayState(Boolean isDisPlayState, String categoryId) {
+        List<ArchivesDictionary> list = archivesDictionaryRepository.findByIsDisplayAndCategoryId(isDisPlayState, categoryId);
         List<ArchivesDictionaryDTO> list1 = new ArrayList<>();
         list.forEach(item -> {
             ArchivesDictionaryDTO ar = archivesDictionaryMapper.toDto(item);
@@ -181,12 +182,12 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
     @Override
     public void updateDisplaryOrder(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
-        archivesDisplaySmallDTO.forEach(item->{
+        archivesDisplaySmallDTO.forEach(item -> {
             ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
-            if (archivesDictionary!=null){
+            if (archivesDictionary != null) {
                 archivesDictionary.setDisplayOrder(item.getDisplayOrder());
                 archivesDictionaryRepository.save(archivesDictionary);
-            }else {
+            } else {
                 throw new BaseException("没有找到数据");
             }
         });
@@ -194,12 +195,25 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService {
 
     @Override
     public void updateQueue(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTO) {
-        archivesDisplaySmallDTO.forEach(item->{
+        archivesDisplaySmallDTO.forEach(item -> {
             ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
-            if (archivesDictionary!=null){
+            if (archivesDictionary != null) {
                 archivesDictionary.setQueue(item.getQueue());
                 archivesDictionaryRepository.save(archivesDictionary);
-            }else {
+            } else {
+                throw new BaseException("没有找到数据");
+            }
+        });
+    }
+
+    @Override
+    public void updateOrderBy(Set<ArchivesDisplaySmallDTO> archivesDisplaySmallDTOS) {
+        archivesDisplaySmallDTOS.forEach(item -> {
+            ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new);
+            if (archivesDictionary != null) {
+                archivesDictionary.setDisplayOrderBy(item.getDisplayOrderBy());
+                archivesDictionaryRepository.save(archivesDictionary);
+            } else {
                 throw new BaseException("没有找到数据");
             }
         });

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java

@@ -46,7 +46,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
             if (archivesType.getPid() == null) {
                 archivesType.setPid("0");
             }
-            archivesType.setPid("0");
             archivesType.setId(NanoIdUtils.randomNanoId());
             archivesType.setEnName(tableName);
             archivesTypeRepository.save(archivesType);