Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

# Conflicts:
#	sql/edu_update.sql

src/main/java/org/rcisoft/business/brooms/service/impl/BRoomsServiceImpl.java

@@ -127,8 +127,15 @@ public class BRoomsServiceImpl implements BRoomsService {
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_NOT_EXIST);
         }
         String result = "";
+
         for(String[] value : values){
 
+            if(value[0] == null || value[1] == null || value[2] == null || value[3] == null || value[4] == null || value[5] == null
+                    && value[0].equals("") && value[1].equals("") && value[2].equals("") && value[3].equals("") && value[4].equals("") && value[5].equals("")){
+                result += "表中存在空数据";
+                continue;
+            }
+
             if(allCode.contains(value[1])){
                 result += "编号 " + value[1] + " 已经存在于数据库  ";
                 continue;
@@ -201,6 +208,7 @@ public class BRoomsServiceImpl implements BRoomsService {
             result += "成功插入了 " + i + "条数据";
         }else {
             result += "没有输入被插入";
+            flag = 0;
         }
 
         return new PersistModel(flag, result);