From 56464bead5ff089bddc29326ae87b384ec7c113d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 4 Jul 2023 19:31:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=80=E5=8F=91=E4=B8=BB?=
 =?UTF-8?q?=E7=AE=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/HyPartnerLineInfoMapper.xml    |  8 ++++----
 .../store/service/impl/InterviewServiceImpl.java    | 13 ++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index e79b606da..76778f863 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -593,10 +593,10 @@
 
   <!-- 根据面试计划 id 查询战区 id -->
   <select id="getAffiliationZoneIdByInterviewPlanId" resultType="java.lang.String">
-    SELECT affiliation_zone
-      FROM hy_partner_line_info
-      WHERE id = (
-        SELECT partner_line_id
+    SELECT want_shop_area
+      FROM hy_partner_user_info
+      WHERE partner_id = (
+        SELECT partner_id
           FROM hy_partner_interview_plan
           WHERE id = #{interviewPlanId}
       )
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
index 3ad3ee612..0efa8d080 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
@@ -11,6 +11,7 @@ import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dao.EnterpriseUserDAO;
+import com.cool.store.dao.HyIntendDevMappingDAO;
 import com.cool.store.dao.HyInterviewDAO;
 import com.cool.store.dto.calendar.CreateCalendarEventDTO;
 import com.cool.store.dto.calendar.DeleteCalendarEventDTO;
@@ -46,6 +47,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -107,6 +109,9 @@ public class InterviewServiceImpl implements InterviewService {
         return interviewList;
     }
 
+    @Resource
+    HyIntendDevMappingDAO hyIntendDevMappingDAO;
+
     @Override
     public InterviewVO getInterviewInfo(QueryByInterviewPlanIdReq request) throws ApiException {
         String interviewPlanId = request.getInterviewPlanId();
@@ -135,12 +140,14 @@ public class InterviewServiceImpl implements InterviewService {
         //查询开发主管信息
         if (request.getNeedDevelopmentDirector() != null && request.getNeedDevelopmentDirector()) {
             //查询所属战区
-            String affiliationZoneId = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId);
-            if (affiliationZoneId == null) {
+
+            String wantShopArea = hyPartnerLineInfoMapper.getAffiliationZoneIdByInterviewPlanId(interviewPlanId);
+            HyIntendDevelopementMappingDO hyIntendDevelopementMappingDO = hyIntendDevMappingDAO.selectByOpenAreaMappingId(Long.valueOf(wantShopArea), "dev");
+            if (hyIntendDevelopementMappingDO == null) {
                 return vo;
             }
             //查询开发主管
-            EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(Long.parseLong(affiliationZoneId));
+            EnterpriseUserDO development = enterpriseUserService.getDevelopmentByZoneId(Long.parseLong(hyIntendDevelopementMappingDO.getMappingId()));
             vo.setDevelopmentDirector(development);
         }
         return vo;