BUG修复

src/com/api/browser/service/impl/JobBrowserService.java

@@ -106,7 +106,7 @@ public class JobBrowserService extends BrowserService {
         }
         String jobName = Util.null2String(params.get("jobName"));
         if (StringUtils.isNotBlank(jobName)) {
-            sqlWhere += " AND t.job_name " + dbType.like(jobName);
+            sqlWhere += " AND h.jobtitlename " + dbType.like(jobName);
         }
         String ecCompany = Util.null2String(params.get("ecCompany"));
         if (StringUtils.isNotBlank(ecCompany)) {

src/com/engine/organization/entity/job/vo/JobBrowserVO.java

@@ -19,8 +19,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7123",
-        fields = "t.id, t.job_no, t.job_name as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id",
-        fromSql = "FROM jcl_org_job t ",
+        fields = "t.id, t.job_no, h.jobtitlename as name, t.sequence_id, t.scheme_id , t.grade_id , t.level_id",
+        fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id  ",
         orderby = "id",
         sortway = "asc",
         primarykey = "id",

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

@@ -139,4 +139,7 @@ public interface JobMapper {
      */
     Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob);
 
+    int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);
+
+
 }

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

@@ -474,6 +474,19 @@
         </foreach>
     </select>
 
+    <update id="updateJobCompany">
+        update jcl_org_job
+        <set>
+            parent_comp = #{parentCompany},
+            ec_company =#{ecCompany},
+        </set>
+        where delete_type = 0
+        AND id IN
+        <foreach collection="ids" open="(" item="id" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 
     <sql id="nullparentDept">
         and ifnull(ec_department,0) =

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

@@ -820,15 +820,11 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
      * @param parentComp
      */
     private void refreshJobComp(Integer parentDepartment, Integer parentComp) {
-        //List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment);
-        //jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
-        //if (CollectionUtils.isNotEmpty(jobPOS)) {
-        //    getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp);
-        //    for (JobPO jobPO : jobPOS) {
-        //        // 刷新组织架构图
-        //        new JobTriggerRunnable(jobPO.getId()).run();
-        //    }
-        //}
+        List<JobPO> jobPOS = getJobMapper().listJobsByDepartmentId(parentDepartment);
+        jobPOS = jobPOS.stream().filter(item -> null == item.getParentJob() || 0 == item.getParentJob()).collect(Collectors.toList());
+        if (CollectionUtils.isNotEmpty(jobPOS)) {
+            getJobMapper().updateJobCompany(jobPOS.stream().map(JobPO::getId).collect(Collectors.toList()), parentComp, parentComp);
+        }
     }
 
     private List<SearchConditionGroup> getDepartmentConditionGroups(Map<String, Object> params) {