修改查询totalbug

PAS/pom.xml

@@ -175,7 +175,7 @@
     </dependencies>
 
     <build>
-        <finalName>PAS_TEST</finalName>
+        <finalName>PAS_PROD2.0</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldService.java

@@ -82,11 +82,14 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
     }
     public Map<Integer,List<PatentDTO.Field>> getPatentFieldByPatentIdAndProjectId2(Integer projectId, List<Integer> patentIds) {
         Map<Integer,List<PatentDTO.Field>> map =new HashMap<>();
+        List<ProjectFieldPatentLink> linkList =new ArrayList<>();
         //根据专利号和专题库id获得所有自定义字段关联数据
-        LambdaQueryWrapper<ProjectFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(ProjectFieldPatentLink::getPatentId, patentIds);
-        queryWrapper.eq(ProjectFieldPatentLink::getProjectId, projectId);
-        List<ProjectFieldPatentLink> linkList=projectFieldPatentLinkService.list(queryWrapper);
+        if(patentIds.size()>0) {
+            LambdaQueryWrapper<ProjectFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(ProjectFieldPatentLink::getPatentId, patentIds);
+            queryWrapper.eq(ProjectFieldPatentLink::getProjectId, projectId);
+            linkList = projectFieldPatentLinkService.list(queryWrapper);
+        }
         List<Integer> fieldIds = linkList.stream().map(ProjectFieldPatentLink::getFieldId).distinct().collect(Collectors.toList());
         List<ProjectField> fieldList = this.getFieldListByIds(fieldIds);
         List<ProjectFieldText> textList = projectFieldTextService.getProjectFieldTextByFieldIds(fieldIds);

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -359,7 +359,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
                     break;
             }
         });
-        clientList.forEach(item -> client.put(item.getName(), projectList.stream().filter(project -> project.getClientId().equals(item.getId())).count()));
+        clientList.forEach(item -> client.put(item.getName(), projectList.stream().filter(project -> item.getId().equals(project.getClientId())).count()));
         Date date = DateUtil.date();
         for (int i = 0; i < 6; i++) {
             Date finalDate = date;