|
|
@@ -2,6 +2,7 @@ package com.goafanti.common.service;
|
|
|
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -20,8 +21,18 @@ public class GlobalSearchService extends BaseMybatisDao<JtCollectSearchMapper>
|
|
|
if(StringUtils.isNotBlank(name))params.put("name", name);
|
|
|
if(pageNo==null||pageNo<1)pageNo=1;
|
|
|
if(pageSize==null||pageSize<1)pageSize=10;
|
|
|
- return (Pagination<JtCollectSearch>) findPage("globalSearchList", "globalSearchCount", params, pageNo,
|
|
|
+ Pagination<JtCollectSearch> p= (Pagination<JtCollectSearch>) findPage("globalSearchList", "globalSearchCount", params, pageNo,
|
|
|
pageSize);
|
|
|
+ List<JtCollectSearch> list= (List<JtCollectSearch>) p.getList();
|
|
|
+ for (JtCollectSearch j : list) {
|
|
|
+ if (StringUtils.isBlank(j.getKeyword())) {
|
|
|
+ j.setKeyword("暂无");
|
|
|
+ }
|
|
|
+ if (StringUtils.isBlank(j.getSummary())) {
|
|
|
+ j.setSummary("暂无");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return p;
|
|
|
|
|
|
}
|
|
|
|