|
@@ -129,14 +129,10 @@ public class AssoProductPatentService extends ServiceImpl<AssoProductPatentMappe
|
|
|
IPage<PatentDTO> pageList = new Page<>();
|
|
|
|
|
|
//判断本次请求是查询产品的商品化专利还是相关专利
|
|
|
- IPage<Patent> dataPage = null;
|
|
|
- if (params.getQueryType() != null) {
|
|
|
- if (params.getQueryType() == 1) { //查商品化专利(与原先相同)
|
|
|
- dataPage = baseMapper.getPageListProductPatent(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
- } else if (params.getQueryType() == 2) { //查相关专利
|
|
|
- dataPage = baseMapper.getPageListStructurePatent(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
- }
|
|
|
- } else { //与原先相同
|
|
|
+ IPage<Patent> dataPage;
|
|
|
+ if (params.getQueryType() != null && params.getQueryType() == 2) { //查相关专利
|
|
|
+ dataPage = baseMapper.getPageListStructurePatent(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
+ } else { //与原先相同(查商品化专利或架构的相关专利)
|
|
|
dataPage = baseMapper.getPageListProductPatent(new Page<>(params.getCurrent(), params.getSize()), params);
|
|
|
}
|
|
|
|