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

更改公海查询权限

Browse Source
This commit is contained in:
xiaodong.hu
2023-11-13 18:07:47 +08:00
parent 6d268cd523
commit c9d97e0e2d
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -918,6 +918,11 @@
<if test="userChannelQueryType!=null and userChannelQueryType == 'blank' ">
AND hpuinfo.user_channel_id is null
</if>
<if test="userIdList!=null and userIdList.size>0 and developmentManagerList!=null and developmentManagerList.size==0">
<foreach collection="userIdList" item="userId" open="and hpli.investment_manager in (" close=")" separator=",">
#{userId}
</foreach>
</if>
<if test="userIdList!=null and userIdList.size==0 and developmentManagerList!=null and developmentManagerList.size>0">
<foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">
#{developmentManager}

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -986,9 +986,18 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
public LinePageInfoVo privateSeaPageDetailNext(String userId, PrivateSeaLineListRequest request, Boolean allPrivateSeaFlag) {
request.setPageNum((int) Math.ceil((double) request.getPageNum() / request.getPageSize()));
//allPrivateSeaFlag 为true的时候 查询全量私海
// V1.5.2 修改allPrivateSeaFlag 为False 查询我的线索 为true时根据是否是超管或者主管查询数据
UserPositionAndUserScopeDTO userIdsByScope = new UserPositionAndUserScopeDTO();
if (!allPrivateSeaFlag) {
userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
//如果是查询团队线索 判断是否是超管 不是超管 判断是是否是主管
if (allPrivateSeaFlag){
//如果不是超管 查询个人数据或者主管数据 如果是超管 查询所有数据
if (!isSuperAdmin(userId)){
userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
}
}else {
//如果是查询我的线索 只需要查询招商经理或者开发经理是我的线索
userIdsByScope.setDevelopmentUserIds(Arrays.asList(userId));
userIdsByScope.setInvestmentUserIds(Arrays.asList(userId));
}
String intentAreaName = getIntentAreaName(request.getIntentAreaId());
Integer pageNum = request.getPageNum();
@@ -1004,7 +1013,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
}
if (PageTurnTypeEnum.NEXT.getText().equals(request.getPageTurn())) {
//下一页
return first.get() +1>linePageInfoVo.size()?null:linePageInfoVo.get(first.get() +1);
return first.get() +1>=linePageInfoVo.size()?null:linePageInfoVo.get(first.get() +1);
}
if (PageTurnTypeEnum.PREVIOUS.getText().equals(request.getPageTurn())) {
//上一页
@@ -1029,7 +1038,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
}
if (PageTurnTypeEnum.NEXT.getText().equals(lineRequest.getPageTurn())) {
//下一页
return first.get() +1>linePageInfoVoList.size()?null:linePageInfoVoList.get(first.get() +1);
return first.get() +1>=linePageInfoVoList.size()?null:linePageInfoVoList.get(first.get() +1);
}
if (PageTurnTypeEnum.PREVIOUS.getText().equals(lineRequest.getPageTurn())) {
//上一页