修改地区和运营商条件判断bug
This commit is contained in:
@@ -119,9 +119,9 @@ public class AvContentCfgService extends BaseService{
|
|||||||
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
||||||
StringBuffer areaEffectiveIds=new StringBuffer();
|
StringBuffer areaEffectiveIds=new StringBuffer();
|
||||||
for(int i=0;i<areaIsps.size();i++){
|
for(int i=0;i<areaIsps.size();i++){
|
||||||
if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
|
if(StringUtils.isBlank(areaIsps.get(i).getArea())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
||||||
}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
|
}else if(StringUtils.isBlank(areaIsps.get(i).getIsp())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
||||||
}else{
|
}else{
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
||||||
@@ -790,9 +790,9 @@ public class AvContentCfgService extends BaseService{
|
|||||||
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
||||||
StringBuffer areaEffectiveIds=new StringBuffer();
|
StringBuffer areaEffectiveIds=new StringBuffer();
|
||||||
for(int i=0;i<areaIsps.size();i++){
|
for(int i=0;i<areaIsps.size();i++){
|
||||||
if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
|
if(StringUtils.isBlank(areaIsps.get(i).getArea())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
||||||
}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
|
}else if(StringUtils.isBlank(areaIsps.get(i).getIsp())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
||||||
}else{
|
}else{
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
||||||
@@ -1096,9 +1096,9 @@ public class AvContentCfgService extends BaseService{
|
|||||||
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
||||||
StringBuffer areaEffectiveIds=new StringBuffer();
|
StringBuffer areaEffectiveIds=new StringBuffer();
|
||||||
for(int i=0;i<areaIsps.size();i++){
|
for(int i=0;i<areaIsps.size();i++){
|
||||||
if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
|
if(StringUtils.isBlank(areaIsps.get(i).getArea())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
||||||
}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
|
}else if(StringUtils.isBlank(areaIsps.get(i).getIsp())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
||||||
}else{
|
}else{
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
||||||
@@ -1366,9 +1366,9 @@ public class AvContentCfgService extends BaseService{
|
|||||||
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
if(Constants.AREA_EFFECTIVE_TYPE_AREA_ISP==entity.getAreaType()&&areaIsps!=null&&areaIsps.size()>0){
|
||||||
StringBuffer areaEffectiveIds=new StringBuffer();
|
StringBuffer areaEffectiveIds=new StringBuffer();
|
||||||
for(int i=0;i<areaIsps.size();i++){
|
for(int i=0;i<areaIsps.size();i++){
|
||||||
if(StringUtils.isNotBlank(areaIsps.get(i).getArea())){
|
if(StringUtils.isBlank(areaIsps.get(i).getArea())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getIsp());
|
||||||
}else if(StringUtils.isNotBlank(areaIsps.get(i).getIsp())){
|
}else if(StringUtils.isBlank(areaIsps.get(i).getIsp())){
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
areaEffectiveIds.append(areaIsps.get(i).getArea());
|
||||||
}else{
|
}else{
|
||||||
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
areaEffectiveIds.append(areaIsps.get(i).getArea()+":"+areaIsps.get(i).getIsp());
|
||||||
|
|||||||
Reference in New Issue
Block a user