diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
index dbb61371e..235019244 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
@@ -264,7 +264,7 @@
     b.want_shop_area as wantShopArea,
     b.accept_adjust_type as acceptAdjustType,
     b.deadline as deadline
-    from hy_partner_intent_info b   left join  hy_partner_line_info a on  a.id = b.partner_line_id
+    from  hy_partner_line_info a   right join  hy_partner_intent_info b  on  a.id = b.partner_line_id
     <where>
       <if test="userId!=null and userId!=''">
         and a.investment_manager = #{userId}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
index da78ff652..101a58f66 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
@@ -28,7 +28,7 @@ public class PartnerIntentInfoVO {
 
     private String workflowStage;
 
-    private String workflowStauts;
+    private String workflowStatus;
 
     @ApiModelProperty("加盟商手机号")
     private String partnerUserPhone;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
index 96f468365..deda24437 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
@@ -116,7 +116,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
         partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
         partnerIntentInfoVO.setWorkflowStage(hyPartnerLineInfoDO.getWorkflowStage());
-        partnerIntentInfoVO.setWorkflowStauts(hyPartnerLineInfoDO.getWorkflowStatus());
+        partnerIntentInfoVO.setWorkflowStatus(hyPartnerLineInfoDO.getWorkflowStatus());
         partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
         HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
         partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaName());
@@ -226,7 +226,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand());
         partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength());
         partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove());
-        partnerIntentInfoVO.setWantShopInfo(JSONObject.parseArray(hyPartnerIntentInfoDO.getWantShopInfo(), WantShopInfoVO.class));
+        if(StringUtils.isNotEmpty(hyPartnerIntentInfoDO.getWantShopInfo())){
+            partnerIntentInfoVO.setWantShopInfo(JSONObject.parseArray(hyPartnerIntentInfoDO.getWantShopInfo(), WantShopInfoVO.class));
+        }
         return partnerIntentInfoVO;
     }