|
@@ -14,6 +14,8 @@ import com.dragonsoft.duceap.base.entity.search.SearchDTO;
|
|
|
import com.dragonsoft.duceap.base.enums.BooleanEnum;
|
|
|
import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
|
|
|
import com.dragonsoft.duceap.core.search.Searchable;
|
|
|
+import com.dragonsoft.duceap.core.search.enums.SearchOperator;
|
|
|
+import com.dragonsoft.duceap.core.search.filter.Condition;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
@@ -48,6 +50,11 @@ public class AppColumnRelationFacade implements IAppColumnRelationFacaed {
|
|
|
Searchable searchable = Searchable.toSearchable(searchDTO);
|
|
|
Pageable pageable = searchable.getPage();
|
|
|
searchable.addSort(Sort.Direction.DESC, "createTime");
|
|
|
+ Condition columnRelation = searchable.getSearchFilter("columnRelation", SearchOperator.like);
|
|
|
+ if (columnRelation != null) {
|
|
|
+ searchable.removeSearchFilter("columnRelation", SearchOperator.like);
|
|
|
+ searchable.addSearchFilter("codeName", SearchOperator.like, columnRelation.getValue().toString());
|
|
|
+ }
|
|
|
Page<AppColumnRelation> page = appColumnRelationService.pageSearch(searchable);
|
|
|
if (page.isEmpty()) {
|
|
|
return new PageImpl<>(Collections.emptyList(), pageable, 0L);
|