7x31
/
databasir
mirror of https://github.com/vran-dev/databasir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219 from vran-dev/fix/fulltext 

fix: duplicate search result
This commit is contained in:
vran 2022-05-29 21:42:10 +08:00 committed by GitHub
parent 9ab15514b5 d9a9f359cd
commit 0fd60c8bc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
View File

@ -238,7 +238,7 @@ public class DocumentService {
GroupPojo group = groupDao.selectById(project.getGroupId()); GroupPojo group = groupDao.selectById(project.getGroupId());
List<TableColumnDocumentPojo> columns = tableColumnDocumentDao.selectByTableDocumentId(table.getId()); List<TableColumnDocumentPojo> columns = tableColumnDocumentDao.selectByTableDocumentId(table.getId());
// clear outdated data before save // clear outdated data before save
documentFullTextDao.deleteByTableId(table.getId()); documentFullTextDao.deleteTableFullText(table.getId());
List<DocumentFullTextPojo> fullTextPojoList = columns.stream() List<DocumentFullTextPojo> fullTextPojoList = columns.stream()
.map(column -> { .map(column -> {
String tableName = table.getName(); String tableName = table.getName();

5
dao/src/main/java/com/databasir/dao/impl/DocumentFullTextDao.java
View File

@ -160,8 +160,9 @@ public class DocumentFullTextDao extends BaseDao<DocumentFullTextPojo> {
return new PageImpl<>(content, pageable, total.longValue()); return new PageImpl<>(content, pageable, total.longValue());
} }
public int deleteByTableId(Integer tableDocumentId) { public int deleteTableFullText(Integer projectId) {
return this.delete(DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID.eq(tableDocumentId)); return this.delete(DOCUMENT_FULL_TEXT.PROJECT_ID.eq(projectId)
.and(DOCUMENT_FULL_TEXT.TABLE_DOCUMENT_ID.isNotNull()));
} }
public int deleteByGroupId(Integer groupId) { public int deleteByGroupId(Integer groupId) {