From 5731e874f17a0cb72498cb7550c01e2f52622095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 20 Jun 2023 14:37:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=88=98=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyIntendDevMappingDAO.java | 7 ++++++ .../HyIntendDevelopementMappingMapper.java | 2 ++ .../HyIntendDevelopementMappingMapper.xml | 15 ++++++++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 24 +++++++++---------- .../store/service/impl/ZoneServiceImpl.java | 2 +- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java index bbd32f119..c6dd4c626 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java @@ -52,6 +52,13 @@ public class HyIntendDevMappingDAO { return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList); } + public List selectByOpenAreaMappingIdList(List idList){ + if (CollectionUtils.isEmpty(idList)){ + return new ArrayList<>(); + } + return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList); + } + public int batchInsert(List recordList){ if (CollectionUtils.isEmpty(recordList)){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java index 11e58073d..ad61c250b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java @@ -54,4 +54,6 @@ public interface HyIntendDevelopementMappingMapper { * @return */ List selectByMappingIdList(@Param("mappingIdList") List mappingIdList); + + List selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List openAreaMappingIdList); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index e3f763f7f..d81c6823d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -130,4 +130,19 @@ + + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 434e90380..f24fe9f51 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -247,20 +247,20 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override public PageInfo publicSeaLineList(String userId, LineRequest lineRequest) { //确认是招商经理还是部门负责人 - EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); - List userIds = new ArrayList<>(); - if (userInfo.getIsLeader()){ - if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){ - List regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class); - List enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true); - userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); - } - }else { - userIds = Arrays.asList(userId); - } +// EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId); +// List userIds = new ArrayList<>(); +// if (userInfo.getIsLeader()){ +// if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){ +// List regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class); +// List enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true); +// userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); +// } +// }else { +// userIds = Arrays.asList(userId); +// } PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize()); PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(), - lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds)); + lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null)); List list = publicSeaLineList.getList(); if (CollectionUtils.isEmpty(list)){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java index d114200ef..743a956a2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java @@ -202,7 +202,7 @@ public class ZoneServiceImpl implements ZoneService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //查询已经绑定战区的 意向区域 - List list = hyIntendDevMappingDAO.selectByMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); + List list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList()); List openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList()); List hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdList); Map areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName));