作者：张哲

时间：2023/05/30
类型：需求变更
描述：里程碑(3) 综合统计人员&部门判空处理

src/main/java/com/redxun/knowledge/analysis/service/AnalysisAlbumServiceImpl.java

@@ -268,6 +268,10 @@ public class AnalysisAlbumServiceImpl {
         if (!StringUtils.isEmpty(personVisitDto.getCreateTime()) && !StringUtils.isEmpty(personVisitDto.getEndTime())){
             personVisitDto.setType(null);
         }
+        //如果人员和部门同时为空，返回空
+        if (CollectionUtils.isEmpty(personVisitDto.getPersonId()) && StringUtils.isEmpty(personVisitDto.getOrganizationId())){
+            return mapCompanyVoList;
+        }
         //查询人员
         if (!CollectionUtils.isEmpty(personVisitDto.getPersonId())){
             personVisitDto.setOrganizationId(null);

src/main/java/com/redxun/knowledge/analysis/service/AnalysisCommonServiceImpl.java

@@ -360,6 +360,10 @@ public class AnalysisCommonServiceImpl {
         if (!StringUtils.isEmpty(personVisitDto.getCreateTime()) && !StringUtils.isEmpty(personVisitDto.getEndTime())){
             personVisitDto.setType(null);
         }
+        //如果人员和部门同时为空，返回空
+        if (CollectionUtils.isEmpty(personVisitDto.getPersonId()) && StringUtils.isEmpty(personVisitDto.getOrganizationId())){
+            return knowledgeCompanyVoList;
+        }
         //查询人员
         if (!CollectionUtils.isEmpty(personVisitDto.getPersonId())){
             personVisitDto.setOrganizationId(null);

src/main/java/com/redxun/knowledge/analysis/service/AnalysisMapServiceImpl.java

@@ -233,6 +233,10 @@ public class AnalysisMapServiceImpl {
         if (!StringUtils.isEmpty(personVisitDto.getCreateTime()) && !StringUtils.isEmpty(personVisitDto.getEndTime())){
             personVisitDto.setType(null);
         }
+        //如果人员和部门同时为空，返回空
+        if (CollectionUtils.isEmpty(personVisitDto.getPersonId()) && StringUtils.isEmpty(personVisitDto.getOrganizationId())){
+            return mapCompanyVoList;
+        }
         //查询人员
         if (!CollectionUtils.isEmpty(personVisitDto.getPersonId())){
             personVisitDto.setOrganizationId(null);

src/main/java/com/redxun/knowledge/analysis/service/AnalysisSearchServiceImpl.java

@@ -174,6 +174,10 @@ public class AnalysisSearchServiceImpl {
         if (!StringUtils.isEmpty(personVisitDto.getCreateTime()) && !StringUtils.isEmpty(personVisitDto.getEndTime())){
             personVisitDto.setType(null);
         }
+        //如果人员和部门同时为空，返回空
+        if (CollectionUtils.isEmpty(personVisitDto.getPersonId()) && StringUtils.isEmpty(personVisitDto.getOrganizationId())){
+            return searchCompanyVoList;
+        }
         //查询人员
         if (!CollectionUtils.isEmpty(personVisitDto.getPersonId())){
             personVisitDto.setOrganizationId(null);

src/main/java/com/redxun/knowledge/analysis/service/AnalysisSynthesizeServiceImpl.java

@@ -257,6 +257,10 @@ public class AnalysisSynthesizeServiceImpl {
         if (!StringUtils.isEmpty(personVisitDto.getCreateTime()) && !StringUtils.isEmpty(personVisitDto.getEndTime())){
             personVisitDto.setType(null);
         }
+        //如果人员和部门同时为空，返回空
+        if (CollectionUtils.isEmpty(personVisitDto.getPersonId()) && StringUtils.isEmpty(personVisitDto.getOrganizationId())){
+            return synthesizeCompanyVos;
+        }
         //查询人员
         if (!CollectionUtils.isEmpty(personVisitDto.getPersonId())){
             personVisitDto.setOrganizationId(null);