diff --git a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesApplyInfoServiceImpl.java b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesApplyInfoServiceImpl.java
index f5744c8..e256bf3 100644
--- a/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesApplyInfoServiceImpl.java
+++ b/vetti-hotakes/src/main/java/com/vetti/hotake/service/impl/HotakeRolesApplyInfoServiceImpl.java
@@ -51,7 +51,22 @@ public class HotakeRolesApplyInfoServiceImpl extends BaseServiceImpl implements
     @Override
     public HotakeRolesApplyInfo selectHotakeRolesApplyInfoById(Long id)
     {
-        return hotakeRolesApplyInfoMapper.selectHotakeRolesApplyInfoById(id);
+        HotakeRolesApplyInfo applyInfo = hotakeRolesApplyInfoMapper.selectHotakeRolesApplyInfoById(id);
+        //查询岗位数据集合
+        HotakeRolesInfo query = new HotakeRolesInfo();
+        List<HotakeRolesInfo> rolesInfoList = hotakeRolesInfoMapper.selectHotakeRolesInfoList(query);
+        if(applyInfo.getRoleId() != null){
+            List<HotakeRolesInfo> rolesInfos = rolesInfoList.stream().filter(e->e.getId().longValue() == applyInfo.getRoleId().longValue()).toList();
+            if(CollectionUtil.isNotEmpty(rolesInfos)) {
+                applyInfo.setRolesInfo(rolesInfos.get(0));
+            }
+        }
+        if(StrUtil.isNotEmpty(applyInfo.getCvTemplateJson())){
+            HotakeCvInfoDto cvInfoDto = handleAnalysisCvInfo(applyInfo.getCvTemplateJson());
+            applyInfo.setCvInfoDto(cvInfoDto);
+        }
+
+        return applyInfo;
     }
 
     /**
@@ -65,23 +80,23 @@ public class HotakeRolesApplyInfoServiceImpl extends BaseServiceImpl implements
     public List<HotakeRolesApplyInfo> selectHotakeRolesApplyInfoList(HotakeRolesApplyInfo hotakeRolesApplyInfo)
     {
         List<HotakeRolesApplyInfo> applyInfoList = hotakeRolesApplyInfoMapper.selectHotakeRolesApplyInfoList(hotakeRolesApplyInfo);
-        if(CollectionUtil.isEmpty(applyInfoList)) {
+        if(CollectionUtil.isNotEmpty(applyInfoList)) {
             //查询岗位数据集合
             HotakeRolesInfo query = new HotakeRolesInfo();
-            query.setRecruiterId(SecurityUtils.getUserId());
+//            query.setRecruiterId(SecurityUtils.getUserId());
             List<HotakeRolesInfo> rolesInfoList = hotakeRolesInfoMapper.selectHotakeRolesInfoList(query);
 
             for(HotakeRolesApplyInfo applyInfo : applyInfoList) {
-                for(HotakeRolesInfo rolesInfo : rolesInfoList) {
-                    if(rolesInfo.getId().longValue() == applyInfo.getRoleId().longValue()) {
-                        applyInfo.setRolesInfo(rolesInfo);
+                if(applyInfo.getRoleId() != null){
+                    List<HotakeRolesInfo> rolesInfos = rolesInfoList.stream().filter(e->e.getId().longValue() == applyInfo.getRoleId().longValue()).toList();
+                    if(CollectionUtil.isNotEmpty(rolesInfos)) {
+                        applyInfo.setRolesInfo(rolesInfos.get(0));
                     }
                 }
                 if(StrUtil.isNotEmpty(applyInfo.getCvTemplateJson())){
                     HotakeCvInfoDto cvInfoDto = handleAnalysisCvInfo(applyInfo.getCvTemplateJson());
                     applyInfo.setCvInfoDto(cvInfoDto);
                 }
-
             }
         }
         return applyInfoList;