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 69e78d271..4314047f2 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 @@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper; import com.google.common.collect.Lists; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; +import com.jsowell.common.core.domain.entity.SysUser; +import com.jsowell.common.core.domain.model.LoginUser; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.MemberWalletEnum; @@ -38,6 +40,7 @@ import org.springframework.util.StopWatch; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 会员基础信息Service业务层处理 @@ -432,8 +435,23 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { */ @Override public List getMerchantListByAuthV2(List deptIds) { + List resultList = Lists.newArrayList(); // 获取登录用户 所有有权限运营商 - SecurityUtils.getAuthorizedMap(); + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (Objects.isNull(loginUser)) { + return resultList; + } + // 获取登录用户对应的user对象 + SysUser user = loginUser.getUser(); + if (Objects.isNull(user)) { + return resultList; + } + // 获取所属部门id + Long deptId = user.getDeptId(); + if (Objects.isNull(deptId)) { + return resultList; + } + // 根据部门id查询对应的运营商 return null; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index e43f92c0f..e8fbc70d1 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -322,8 +322,8 @@ select from pile_merchant_info - where - dept_id = #{deptId,jdbcType=VARCHAR} + where del_flag = '0' + and dept_id = #{deptId,jdbcType=VARCHAR}