Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/RecommendMgtServiceImpl.java

@@ -189,15 +189,22 @@ public class RecommendMgtServiceImpl implements RecommendMgtService {
             }
         }
         List<RecommendJobVo> list = recommendMgtCQuery.getRecommendJobList(postID, professionID, huntProfessionName, userName, type, cultureRank, keyPersonType, parentProfessionID, workYear,regionCode,siteID, minSalary, maxSalary,stringUtils.ListToInSql(recommendedJobHuntIDList));
+        List<RecommendJobVo> resultList = new ArrayList<>();
         list.forEach(x -> {
             if (stringUtils.IsNullOrEmpty(x.getRecommendMgtID())) {
                 x.setRecommendMgtID(UUID.randomUUID().toString());
             }
-
             x.setUserMobile(calculateUtils.maskMobile(desUtils.decoderText(x.getUserMobile())));
+            //过滤已入职的求职意向数据
+            PcRecommendMgtExample curRecommendMgtExp = new PcRecommendMgtExample();
+            curRecommendMgtExp.or().andJobHuntIDEqualTo(x.getJobhuntID());
+            var curRecommendMgtInfo = pcRecommendMgtMapper.selectByExample(curRecommendMgtExp).stream().findFirst().orElse(null);
+            if( curRecommendMgtInfo ==null || curRecommendMgtInfo.getEntryState().equals(0)){
+                resultList.add(x);
+            }
         });
 
-        PageInfo<RecommendJobVo> result = new PageInfo(list);
+        PageInfo<RecommendJobVo> result = new PageInfo(resultList);
         return result;
     }