fix bug

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

@@ -10,12 +10,14 @@ import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
 import com.storeroom.modules.dictionary.service.ArchivesNoSettingService;
 import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO;
 import com.storeroom.utils.ApiResponse;
+import com.storeroom.utils.StringUtils;
 import com.storeroom.utils.enums.ResponseStatus;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Set;
@@ -82,7 +84,10 @@ public class ArchivesDicSettingController {
 
     @ApiOperation("获取规则列表")
     @AnonymousGetMapping("list")
-    public ApiResponse<Object> getAll() {
-        return ApiResponse.success(arcSettingService.getAll());
+    public ApiResponse<Object> getAll(@RequestParam String categoryId) {
+        if (!StringUtils.isEmpty(categoryId)) {
+            return ApiResponse.success(arcSettingService.findByCategoryId(categoryId));
+        }
+        throw new BaseException("id异常");
     }
 }

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

@@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface ArchivesNoSettingRepository extends JpaRepository<ArchivesNoSetting, String>, JpaSpecificationExecutor<ArchivesNoSetting> {
 
 
@@ -21,4 +23,7 @@ public interface ArchivesNoSettingRepository extends JpaRepository<ArchivesNoSet
 
     @Query(value = "SELECT MAX(sequence) AS maxsque FROM archives_no_setting",nativeQuery = true)
     Integer findByMax();
+
+    @Query(value = "SELECT * FROM archives_no_setting WHERE category_id = ?1 ORDER BY sequence ASC",nativeQuery = true)
+    List<ArchivesNoSetting> findByCategoryId(String id);
 }

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

@@ -55,5 +55,5 @@ public interface ArchivesNoSettingService {
      *
      * @return /
      */
-    List<ArchivesNoSettingDTO> getAll();
+    List<ArchivesNoSettingDTO> findByCategoryId(String categoryId);
 }

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

@@ -91,8 +91,8 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService {
     }
 
     @Override
-    public List<ArchivesNoSettingDTO> getAll() {
-        List<ArchivesNoSetting> ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence"));
+    public List<ArchivesNoSettingDTO> findByCategoryId(String categoryId) {
+        List<ArchivesNoSetting> ar = ansRepostiory.findByCategoryId(categoryId);
         List<ArchivesNoSettingDTO> dtoList = new ArrayList<>();
         ar.forEach(item -> {
             ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item);