|
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.zanxiang.erp.security.util.SecurityUtil;
|
|
import com.zanxiang.game.module.base.utils.BeanUtils;
|
|
import com.zanxiang.game.module.base.utils.BeanUtils;
|
|
import com.zanxiang.game.module.manage.pojo.dto.*;
|
|
import com.zanxiang.game.module.manage.pojo.dto.*;
|
|
import com.zanxiang.game.module.manage.pojo.params.OrderParam;
|
|
import com.zanxiang.game.module.manage.pojo.params.OrderParam;
|
|
@@ -99,7 +100,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
//渠道列表
|
|
//渠道列表
|
|
List<AgentDTO> agentDTOList = agentService.listUserAgent(param.getAccountId(), param.getPitcherId(), param.getChannelId());
|
|
List<AgentDTO> agentDTOList = agentService.listUserAgent(param.getAccountId(), param.getPitcherId(), param.getChannelId());
|
|
//根据条件, 匹配渠道
|
|
//根据条件, 匹配渠道
|
|
- if (CollectionUtils.isEmpty(agentDTOList)) {
|
|
|
|
|
|
+ if (CollectionUtils.isEmpty(agentDTOList) && !SecurityUtil.isAdmin()) {
|
|
return new OrderListVO(param.toPage().getSize());
|
|
return new OrderListVO(param.toPage().getSize());
|
|
}
|
|
}
|
|
//渠道id列表
|
|
//渠道id列表
|