Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/util/ProExcelInfo.java

@@ -367,7 +367,7 @@ public  class ProExcelInfo {
                 if (flag){
                     str+="设备改造类型填写有误;";
                 }else {
-                    if (project.getEquCreateType().equals("无")){
+                    if (!project.getEquCreateType().equals("无")){
                         if (null == project.getEquCreateSize() || "".equals(project.getEquCreateSize())){
                             str+="改造设备尺寸及间隔数不能为空;";
                         }
@@ -435,21 +435,21 @@ public  class ProExcelInfo {
                         }
                         boolean flag1=true;
                         //柱开集中或就业地
-                        if (null!=project.getStayOpenArea()){//柱开集中或就业地
+                        if (null!=project.getStayOpenArea()&&!"".equals(project.getStayOpenArea())){//柱开集中或就业地
                             flag = getJudge(project.getStayOpenArea(),PRO_STAY_AREA);
                             if (flag){
                                 str+="柱开集中或就业地填写有误;";
                             }
                             flag1 = false;
                         }
-                        if (null!=project.getRingNetworkCabinet()){//环网柜
+                        if (null!=project.getRingNetworkCabinet()&&!"".equals(project.getRingNetworkCabinet())){//环网柜
                             flag = getJudge(project.getRingNetworkCabinet(),PRO_RING_NETWORK);
                             if (flag){
                                 str+="环网柜填写有误;";
                             }
                             flag1 = false;
                         }
-                        if (flag){
+                        if (flag1){
                             str +="柱开和环网柜必填之其中之一;";
                         }
                     }