|
@@ -76,16 +76,17 @@ public class ChannelNumberServiceImpl implements IChannelNumberService {
|
|
|
public List<ChannelNumber> selectChannelNumberList(ChannelNumber channelNumber) {
|
|
|
List<ChannelNumber> channelNumbers = channelNumberMapper.selectChannelNumberList(channelNumber);
|
|
|
if (channelNumbers != null && !channelNumbers.isEmpty()) {
|
|
|
- Long channelId = channelNumbers.get(0).getChannelId();
|
|
|
+ ChannelNumber channelNumberOne = channelNumbers.get(0);
|
|
|
+ Long channelId = channelNumberOne.getChannelId();
|
|
|
//判断是否设置过参数
|
|
|
ParameterSet parameterSet = parameterSetMapper.selectParameterSetByChannelId(channelId);
|
|
|
+ channelNumberOne.setIsChannel(N);
|
|
|
if (parameterSet != null) {
|
|
|
- channelNumber.setIsChannel(Y);
|
|
|
- channelNumber.setParameterSet(parameterSet);
|
|
|
+ channelNumberOne.setIsChannel(Y);
|
|
|
+ channelNumberOne.setParameterSet(parameterSet);
|
|
|
}
|
|
|
}
|
|
|
return channelNumbers;
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|