1、优化招聘端-统计分析bug

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobCvRelMapper.java

@@ -234,7 +234,7 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
 
         wrapper.eqIfPresent(JobCvRelDO::getJobId, reqVO.getJobId());
         wrapper.eqIfPresent(JobCvRelDO::getEnterpriseId, reqVO.getEnterpriseId());
-        wrapper.inIfPresent(JobCvRelDO::getUserId, reqVO.getUserId());
+        wrapper.inIfPresent(JobCvRelDO::getPublishUserId, reqVO.getUserId());
         wrapper.groupBy(PersonInfoDO::getSex);
         wrapper.orderByDesc("`key`");
         return selectJoinList(CommonRespVO.class, wrapper);
@@ -265,7 +265,7 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
 
         wrapper.eqIfPresent(JobCvRelDO::getJobId, reqVO.getJobId());
         wrapper.eqIfPresent(JobCvRelDO::getEnterpriseId, reqVO.getEnterpriseId());
-        wrapper.inIfPresent(JobCvRelDO::getUserId, reqVO.getUserId());
+        wrapper.inIfPresent(JobCvRelDO::getPublishUserId, reqVO.getUserId());
         wrapper.groupBy("`key`");
         wrapper.orderByDesc("`key`");
         return selectJoinList(CommonRespVO.class, wrapper);
@@ -285,7 +285,7 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
 
         wrapper.eqIfPresent(JobCvRelDO::getJobId, reqVO.getJobId());
         wrapper.eqIfPresent(JobCvRelDO::getEnterpriseId, reqVO.getEnterpriseId());
-        wrapper.inIfPresent(JobCvRelDO::getUserId, reqVO.getUserId());
+        wrapper.inIfPresent(JobCvRelDO::getPublishUserId, reqVO.getUserId());
         wrapper.groupBy(PersonInfoDO::getExpType);
         wrapper.orderByDesc("`key`");
         return selectJoinList(CommonRespVO.class, wrapper);
@@ -305,7 +305,7 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
 
         wrapper.eqIfPresent(JobCvRelDO::getJobId, reqVO.getJobId());
         wrapper.eqIfPresent(JobCvRelDO::getEnterpriseId, reqVO.getEnterpriseId());
-        wrapper.inIfPresent(JobCvRelDO::getUserId, reqVO.getUserId());
+        wrapper.inIfPresent(JobCvRelDO::getPublishUserId, reqVO.getUserId());
         wrapper.groupBy(PersonInfoDO::getEduType);
         wrapper.orderByDesc("`key`");
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -265,7 +265,10 @@ public class JobCvRelServiceImpl implements JobCvRelService {
                         EducationTypeEnum.getEnumByName(s.getKey()).getType())
                 )
                 .collect(Collectors.toList());
-        return packBarCount(sortedResult);
+        return packBarCount(sortedResult.stream()
+                .filter(c->null!=c.getKey())
+                .collect(Collectors.toList())
+        );
     }
 
     @Override
@@ -291,7 +294,9 @@ public class JobCvRelServiceImpl implements JobCvRelService {
                         EducationTypeEnum.getEnumByName(s.getKey()).getType())
                 )
                 .collect(Collectors.toList());
-        return packBarCount(sortedResult);
+        return packBarCount(sortedResult.stream()
+                .filter(c->null!=c.getKey())
+                .collect(Collectors.toList()));
     }
 
     @Override