Merge pull request 'develop' (#236) from develop into master

Reviewed-on: #236

src/com/engine/organization/util/saveimport/SequenceImportUtil.java

@@ -110,7 +110,7 @@ public class SequenceImportUtil {
                                 OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                 continue nextRow;
                             }
-                            for (int index = 0; index < split.length - 1; index++) {
+                            for (int index = 0; index <= split.length - 1; index++) {
                                 parentCompanyId = MapperProxyFactory.getProxy(CompMapper.class).getIdByNameAndPid(split[index], parentCompanyId == null ? 0 : parentCompanyId);
                                 if (null == parentCompanyId) {
                                     historyDetailPO.setOperateDetail(split[index] + "分部未找到对应数据");
@@ -139,7 +139,9 @@ public class SequenceImportUtil {
 
                 }
             }
-
+            if (i == 0) {
+                continue nextRow;
+            }
           String subCompanyName = (String) map.get("scheme_name");
           String subCompanyId = (String) map.get("subcompanyid");