|
@@ -101,11 +101,10 @@ public class PatentStarApiService {
|
|
|
}
|
|
|
public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS){
|
|
|
starPatentVOS.forEach(item->{
|
|
|
- if(item.getPublicNo()!=null&&item.getPublicNo()!=""){
|
|
|
+ if(item.getPublicNo()!=null&&!item.getPublicNo().equals("")){
|
|
|
item.setPatentNo(item.getPublicNo());
|
|
|
-
|
|
|
}
|
|
|
- else if(item.getAnnounceNo()!=null&&item.getAnnounceNo()!=""){
|
|
|
+ else if(item.getAnnounceNo()!=null&&!item.getAnnounceNo().equals("")){
|
|
|
item.setPublicNo(item.getAnnounceNo());
|
|
|
item.setPatentNo(item.getAnnounceNo());
|
|
|
}
|
|
@@ -211,7 +210,7 @@ public class PatentStarApiService {
|
|
|
Map<String, Object> reMap = new HashMap<>();
|
|
|
reMap.put("size", patentStarListDto.getRowCount());
|
|
|
reMap.put("current", patentStarListDto.getPageNum());
|
|
|
- reMap.put("records",Data.get("List"));
|
|
|
+ reMap.put("records",starPatentVOS);
|
|
|
reMap.put("total", Data.get("HitCount"));
|
|
|
return reMap;
|
|
|
}
|