|
@@ -435,21 +435,21 @@ public class ProExcelInfo {
|
|
}
|
|
}
|
|
boolean flag1=true;
|
|
boolean flag1=true;
|
|
//柱开集中或就业地
|
|
//柱开集中或就业地
|
|
- if (null!=project.getStayOpenArea()){//柱开集中或就业地
|
|
|
|
|
|
+ if (null!=project.getStayOpenArea()&&!"".equals(project.getStayOpenArea())){//柱开集中或就业地
|
|
flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
|
|
flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
|
|
if (flag){
|
|
if (flag){
|
|
str+="柱开集中或就业地填写有误;";
|
|
str+="柱开集中或就业地填写有误;";
|
|
}
|
|
}
|
|
flag1 = false;
|
|
flag1 = false;
|
|
}
|
|
}
|
|
- if (null!=project.getRingNetworkCabinet()){//环网柜
|
|
|
|
|
|
+ if (null!=project.getRingNetworkCabinet()&&!"".equals(project.getRingNetworkCabinet())){//环网柜
|
|
flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
|
|
flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
|
|
if (flag){
|
|
if (flag){
|
|
str+="环网柜填写有误;";
|
|
str+="环网柜填写有误;";
|
|
}
|
|
}
|
|
flag1 = false;
|
|
flag1 = false;
|
|
}
|
|
}
|
|
- if (flag){
|
|
|
|
|
|
+ if (flag1){
|
|
str +="柱开和环网柜必填之其中之一;";
|
|
str +="柱开和环网柜必填之其中之一;";
|
|
}
|
|
}
|
|
}
|
|
}
|