github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: #1386 (#1390)

pull/1396/head
Ryan Wang 2021-06-01 20:24:08 +08:00 committed by GitHub
parent 1f89ba0ed2
commit 0ade01c518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/run/halo/app/service/CategoryService.java
View File

@ -100,6 +100,14 @@ public interface CategoryService extends CrudService<Category, Integer> {
@NonNull
List<Category> listAll(Sort sort, boolean queryEncryptCategory);
/**
* List all category not encrypt.
*
* @param queryEncryptCategory whether to query encryption category
* @return list of category.
*/
List<Category> listAll(boolean queryEncryptCategory);
/**
* List all by ids
*

2
src/main/java/run/halo/app/service/impl/BackupServiceImpl.java
View File

@ -336,7 +336,7 @@ public class BackupServiceImpl implements BackupService {
data.put("version", HaloConst.HALO_VERSION);
data.put("export_date", DateUtil.now());
data.put("attachments", attachmentService.listAll());
data.put("categories", categoryService.listAll());
data.put("categories", categoryService.listAll(true));
data.put("comment_black_list", commentBlackListService.listAll());
data.put("journals", journalService.listAll());
data.put("journal_comments", journalCommentService.listAll());

11
src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java
View File

@ -67,7 +67,7 @@ public class CategoryServiceImpl extends AbstractCrudService<Category, Integer>
private PostService postService;
private AuthenticationService authenticationService;
private final AuthenticationService authenticationService;
public CategoryServiceImpl(CategoryRepository categoryRepository,
PostCategoryService postCategoryService,
@ -481,6 +481,15 @@ public class CategoryServiceImpl extends AbstractCrudService<Category, Integer>
}
}
@Override
public List<Category> listAll(boolean queryEncryptCategory) {
if (queryEncryptCategory) {
return super.listAll();
} else {
return this.listAll();
}
}
@Override
public List<Category> listAll() {
return filterEncryptCategory(super.listAll());