suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hs/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

Browse Source
This commit is contained in:
zhangchenbiao
2023-10-09 10:32:21 +08:00
parent 1590314f66 32fbac57a1
commit f847c27727
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.service.EnterpriseUserService; import com.cool.store.service.EnterpriseUserService;
import com.cool.store.service.ZoneService; import com.cool.store.service.ZoneService;
import com.cool.store.vo.EnterpriseUserSingleInfoVO; import com.cool.store.vo.EnterpriseUserSingleInfoVO;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
@@ -113,6 +114,8 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService {
} }
//意向区域 //意向区域
List<String> intendList = zoneInfoList.stream().filter(o -> "intent".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList()); List<String> intendList = zoneInfoList.stream().filter(o -> "intent".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList());
result.setInvestmentUserIds(Lists.newArrayList());
result.setDevelopmentUserIds(Lists.newArrayList());
if(CollectionUtils.isNotEmpty(intendList)){ if(CollectionUtils.isNotEmpty(intendList)){
//获取负责的区域 //获取负责的区域
intendList.retainAll(subRegionIds); intendList.retainAll(subRegionIds);