Bladeren bron

Merge remote-tracking branch 'origin/dev' into dev

xiexiang 2 jaren geleden
bovenliggende
commit
f04884d425
4 gewijzigde bestanden met toevoegingen van 60759 en 359 verwijderingen
  1. 1 0
      PAS/src/main/java/cn/cslg/pas/service/PatentService.java
  2. 58949 231
      logs/pas/pas-debug.log
  3. 34 2
      logs/pas/pas-error.log
  4. 1775 126
      logs/pas/pas-info.log

+ 1 - 0
PAS/src/main/java/cn/cslg/pas/service/PatentService.java

@@ -472,6 +472,7 @@ public class PatentService extends ServiceImpl<PatentMapper, Patent> {
     }
     public IPage<PatentDTO> getPageListForRMS(QueryPatentVO params) {
         IPage<Patent> dataPage = baseMapper.getPageListForRMS2(new Page<>(params.getCurrent(), params.getSize()),params);
+
         IPage<PatentDTO> pageList = new Page<>();
         List<PatentDTO> records = new ArrayList<>();
         List<Integer> patentIds = dataPage.getRecords().stream().map(Patent::getId).collect(Collectors.toList());

File diff suppressed because it is too large
+ 58949 - 231
logs/pas/pas-debug.log


File diff suppressed because it is too large
+ 34 - 2
logs/pas/pas-error.log


File diff suppressed because it is too large
+ 1775 - 126
logs/pas/pas-info.log