|
|
@@ -2239,14 +2239,16 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public List<LockingReleaseBo> selectWaitReleaseCustomer(String uid) {
|
|
|
+
|
|
|
List<LockingReleaseBo> list = new ArrayList<>();
|
|
|
//u.channel=0 and u.share_type=0 私有和私有渠道客户 30
|
|
|
//u.share_type in(0) and u.channel=0 and u.new_channel=0 私有 非渠道270
|
|
|
List<LockingReleaseBo> lockingReleaseBos = userLockReleaseMapper.selectWaitReleaseCustomer(uid);
|
|
|
for (LockingReleaseBo bo : lockingReleaseBos) {
|
|
|
- // 渠道为空或者不其他的需要处理
|
|
|
+ //释放非渠道客户和渠道其他分类(不包含空)的客户
|
|
|
if(bo.getNewChannel()==0){
|
|
|
list.add(bo);
|
|
|
+ //渠道客户 并且渠道类型不是
|
|
|
}else if (bo.getNewChannel()==1&&(bo.getChannelType()!=null&&bo.getChannelType()!=1)){
|
|
|
list.add(bo);
|
|
|
}
|