|
|
@ -3089,7 +3089,7 @@ public class HighOrderServiceImpl implements HighOrderService { |
|
|
|
if (MapUtils.getLong(map , "agentId") != null) { |
|
|
|
if (MapUtils.getLong(map , "agentId") != null) { |
|
|
|
criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId")); |
|
|
|
criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId")); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
criteria.andIdentificationCodeIsNotNull(); |
|
|
|
criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
List<HighOrder> list = highOrderMapper.selectByExample(example); |
|
|
|
List<HighOrder> list = highOrderMapper.selectByExample(example); |
|
|
@ -3103,11 +3103,7 @@ public class HighOrderServiceImpl implements HighOrderService { |
|
|
|
if (user != null) { |
|
|
|
if (user != null) { |
|
|
|
order.setAgentName(user.getName()); |
|
|
|
order.setAgentName(user.getName()); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if (order.getIdentificationCode() == 60) { |
|
|
|
order.setAgentName("暂无推广人"); |
|
|
|
order.setAgentName("贵州汇联通"); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
order.setAgentName("暂无推广人"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|