diff --git a/src/com/engine/organization/entity/chart/StatisticsVO.java b/src/com/engine/organization/entity/chart/StatisticsVO.java
index 80b90f55..c326d17b 100644
--- a/src/com/engine/organization/entity/chart/StatisticsVO.java
+++ b/src/com/engine/organization/entity/chart/StatisticsVO.java
@@ -1,6 +1,5 @@
 package com.engine.organization.entity.chart;
 
-import com.icbc.api.internal.apache.http.impl.cookie.S;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index a5bdb0cd..808ffc0a 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -22,7 +22,7 @@
     <select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
         select distinct a.subcompanyid1, a.departmentid, a.jobtitle
         from hrmresource a
-        where a.status &lt; 4
+        where a.status &lt; 4 and a.seclevel &gt;= 0
           and not exists
             (select 1
              from jcl_org_job b
diff --git a/src/com/engine/organization/service/impl/ChartServiceImpl.java b/src/com/engine/organization/service/impl/ChartServiceImpl.java
index 4bc2e1d4..3fab7422 100644
--- a/src/com/engine/organization/service/impl/ChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ChartServiceImpl.java
@@ -1040,12 +1040,13 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               d.bmfzr          as fleader,\n" +
+                    "               e.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
                     "                 left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
                     "                 left join hrmdepartment c on a.supdepid = c.id\n" +
+                    "                 left join hrmdepartmentdefined e on a.id=e.deptid\n" +
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
         }
 
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 7903d988..0ccd5ea6 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -643,6 +643,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
         btnDatas.put("loginId", user.getUID());
+        btnDatas.put("cardType", new BaseBean().getPropValue("hrmOrganization", "cardType"));
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
         btnDatas.put("searchTemplateId", getSearchTemplateId());
diff --git a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
index d69ce8b1..be3e7246 100644
--- a/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
+++ b/src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java
@@ -236,6 +236,8 @@ public class StaffInfoImportUtil {
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                     continue nextRow;
                                 }
+                                parentJobId = jobPList.get(0).getId();
+
                             }
                         }
                         map.put("job_id", parentJobId);
@@ -292,7 +294,7 @@ public class StaffInfoImportUtil {
                     break;
                 case "3": // 岗位
                     if (null == parentJobId) {
-                        checkMsg = "编制维度选择岗位时，岗位必填！";
+                        checkMsg = "编制维度选择岗位时，未找到对应岗位！";
                     } else {
                         JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId);
                         if (null == jobPO) {