Merge pull request 'feature/cl' (#286) from feature/cl into develop

Reviewed-on: #286

src/com/engine/organization/mapper/job/JobMapper.java

@@ -141,7 +141,7 @@ public interface JobMapper {
      * @param parentJob
      * @return
      */
-    Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
+    List<JobPO> getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
                            @Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
 
     int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);

src/com/engine/organization/mapper/job/JobMapper.xml

@@ -482,8 +482,10 @@
           and delete_type = 0
     </select>
 
-    <select id="getIdByNameAndPid" resultType="java.lang.Long">
-        select t.id from jcl_org_job t
+    <select id="getIdByNameAndPid" resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_job t
         left join hrmjobtitles h on t.ec_jobTitle = h.id
         left join hrmjobactivities j on h.jobactivityid = j.id
         left join hrmjobgroups f on j.jobgroupid = f.id

src/com/engine/organization/service/impl/ChartServiceImpl.java

@@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 ";
             deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1  as subcompanyid, " +
                     "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," +
-                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " +
+                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " +
                     "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " +
                     "left join hrmdepartment c on a.supdepid = c.id " +
                     "left join hrmdepartmentdefined d on a.id=d.deptid " +
@@ -1040,7 +1040,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               a.bmfzr          as fleader,\n" +
+                    "               d.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
@@ -1671,9 +1671,6 @@ public class ChartServiceImpl extends Service implements ChartService {
      * @return 人员名称
      */
     private String getDepartmentLeader(String ids) {
-        if (!isRealTime) {
-            return ids;
-        }
         if (StringUtils.isBlank(ids)) {
             return "";
         }

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

@@ -222,9 +222,15 @@ public class StaffInfoImportUtil {
                                 continue nextRow;
                             }
                             for (String s : split) {
-                                parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
+                                List<JobPO> jobPList = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
                                 ,jobactivitymark,jobgroupremark);
-                                if (null == parentJobId) {
+                                if (jobPList.size() > 1) {
+                                    historyDetailPO.setOperateDetail(s + "岗位在岗位管理中存在重复数据，请先处理");
+                                    historyDetailPO.setStatus("0");
+                                    OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                                    continue nextRow;
+                                }
+                                if (jobPList.size() == 0) {
                                     historyDetailPO.setOperateDetail(s + "岗位未找到对应数据");
                                     historyDetailPO.setStatus("0");
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);