From 246108f5c52c6e45572f7b0bd71bb6fe6a75c5fe Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 20 Jun 2023 22:15:05 +0800
Subject: [PATCH] nullpointer

---
 .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml    | 2 +-
 .../store/service/impl/HyPartnerIntentInfoServiceImpl.java   | 3 +++
 .../main/java/com/cool/store/controller/DeskController.java  | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 0438e9b35..bed9ee420 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -327,7 +327,7 @@
 
   <update id="updateInvestmentManager">
     update hy_partner_line_info
-      set investment_manager = #{userId}
+      set investment_manager = #{userId}, line_status= '1'
     <if test="lineIdList!=null and lineIdList.size>0">
       <foreach collection="lineIdList" open="where id in (" close=")" separator="," item="lineId">
         #{lineId}
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 b89f87431..fc669f457 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
@@ -109,6 +109,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
     @Override
     public PartnerIntentInfoVO getPartnerIntentApplyDetail(Long lineId) {
         HyPartnerIntentInfoDO hyPartnerIntentInfoDO= hyPartnerIntentInfoDAO.selectByLineId(lineId);
+        if(Objects.isNull(hyPartnerIntentInfoDO)){
+            return null;
+        }
         PartnerIntentInfoVO partnerIntentInfoVO = convertPartnerIntentApplyInfoDOToVO(hyPartnerIntentInfoDO);
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
         partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
index 988ee1317..05737e708 100644
--- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
+++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
@@ -70,9 +70,8 @@ public class DeskController {
 
     @GetMapping(path = "/getUserCalendarsEvents")
     @ApiOperation("飞书日程信息")
-    public ResponseResult<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam(value = "startTime",required = true) Long startTime,
-                                                                              @RequestParam(value = "endTime",required = true) Long endTime) throws ApiException {
-
+    public ResponseResult<List<UserCalendarsEventDTO>> getUserCalendarsEvents(@RequestParam(value = "startTime") Long startTime,
+                                                                              @RequestParam(value = "endTime") Long endTime) throws ApiException {
         String userId = CurrentUserHolder.getUserId();
         return  ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime));
     }