diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java index dbba23b03..7401cda80 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/SecurityUtils.java @@ -146,23 +146,6 @@ public class SecurityUtils { stationDeptIds.add(deptId); resultVO.setStationDeptIds(stationDeptIds); } - - // String deptLevel = dept.getDeptLevel(); - // if (StringUtils.equals(deptLevel, "0")) { - // // 表明是该账号挂在平台下面,是系统管理员 - // } else if (StringUtils.equals(deptLevel, "1")) { - // // 表明是该账号挂在运营商下面,是一级运营商管理员 - // merchantDeptIds.add(deptId); - // resultVO.setMerchantDeptIds(merchantDeptIds); - // } else if (StringUtils.equals(deptLevel, "2")) { - // // 表明是该账号挂在运营商下面,是二级运营商管理员 - // merchantDeptIds.add(deptId); - // resultVO.setMerchantDeptIds(merchantDeptIds); - // } else { - // // 其他情况,表明是站点管理员 - // stationDeptIds.add(deptId); - // resultVO.setStationDeptIds(stationDeptIds); - // } return resultVO; } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java index 35fadc011..d673431f4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java @@ -22,6 +22,7 @@ public class QueryMemberInfoDTO { private String memberId; + // 一级运营商id private String merchantId; private List merchantDeptIds; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index cd0c4dbd6..8bd2f843a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -3,9 +3,11 @@ package com.jsowell.pile.service.impl; import com.google.common.collect.Lists; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.util.DateUtils; +import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.MemberPlateNumberRelation; @@ -304,15 +306,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { */ @Override public List selectMemberList(QueryMemberInfoDTO dto) { - // // 获取登录账号信息 - // AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); - // if (authorizedMap == null) { - // return new ArrayList<>(); - // } - // List merchantDeptIds = authorizedMap.getMerchantDeptIds(); - // if (CollectionUtils.isNotEmpty(merchantDeptIds)) { - // dto.setMerchantDeptIds(merchantDeptIds); - // } + // 获取登录账号信息 + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + if (authorizedMap == null) { + return new ArrayList<>(); + } + List merchantDeptIds = authorizedMap.getMerchantDeptIds(); + if (CollectionUtils.isNotEmpty(merchantDeptIds)) { + dto.setMerchantDeptIds(merchantDeptIds); + } return memberBasicInfoMapper.selectMemberList(dto); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index f1d7fffcc..0db67a440 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -216,7 +216,7 @@ and t1.mobile_number like '%${dto.mobileNumber}%' and t1.nick_name like '%${dto.nickName}%' and t1.member_id like '%${dto.memberId}%' - and t1.merchant_id like '%${dto.merchantId}%' + and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR} and t3.dept_id in