diff --git a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java
index 1e30e7b9..12c573e9 100644
--- a/src/com/engine/organization/thread/DepartmentTriggerRunnable.java
+++ b/src/com/engine/organization/thread/DepartmentTriggerRunnable.java
@@ -168,7 +168,6 @@ public class DepartmentTriggerRunnable implements Runnable {
 
             if (1 != newDepartment.getDeleteType() && 1 != newDepartment.getForbiddenTag()) {
                 MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap);
-<<<<<<< HEAD
             }
             if(null != jclOrgMapByObjID) {
                 updateParentPlanAndJob(jclMap.getFDateBegin(), jclOrgMapByObjID.getFParentId().toString());
@@ -182,17 +181,6 @@ public class DepartmentTriggerRunnable implements Runnable {
             }
             if (null != oldFparentId) {
                 updateParentPlanAndJob(jclMap.getFDateBegin(), oldFparentId);
-=======
-                if(null != jclOrgMapByObjID) {
-                    updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString());
-                }
-                if(null != moveTarget){
-                    updateParentPlanAndJob(currentDate, moveTarget);
-                }
-                if (null != oldFparentId) {
-                    updateParentPlanAndJob(currentDate, oldFparentId);
-                }
->>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021)
             }
         }
     }
@@ -236,4 +224,4 @@ public class DepartmentTriggerRunnable implements Runnable {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/engine/organization/thread/JobTriggerRunnable.java b/src/com/engine/organization/thread/JobTriggerRunnable.java
index eb3dd2ae..81effe44 100644
--- a/src/com/engine/organization/thread/JobTriggerRunnable.java
+++ b/src/com/engine/organization/thread/JobTriggerRunnable.java
@@ -14,7 +14,6 @@ import com.engine.organization.util.OrganizationDateUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
 import weaver.common.DateUtil;
-import weaver.general.Util;
 
 import java.sql.Date;
 import java.util.Calendar;
@@ -74,7 +73,6 @@ public class JobTriggerRunnable implements Runnable {
             return;
         }
         // 判断
-<<<<<<< HEAD
         JclOrgMap jclMap = new JclOrgMap();
         int st = 100000000;
         int sj = 200000000;
@@ -117,43 +115,6 @@ public class JobTriggerRunnable implements Runnable {
             if (null != jclOrgMap) {
                 jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan());
                 jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob());
-=======
-        if (diffFields.contains("jobName") || diffFields.contains("parentDept") || diffFields.contains("parentJob") || diffFields.contains("forbiddenTag") || diffFields.contains("deleteType")) {
-            JclOrgMap jclMap = new JclOrgMap();
-            int st = 100000000;
-            int sj = 200000000;
-            jclMap.setFType(3);
-            // 更新逻辑
-            jclMap.setFObjId(newJob.getId().intValue());
-            jclMap.setId(newJob.getId().intValue() + sj);
-            jclMap.setFNumber(newJob.getJobNo());
-            jclMap.setFName(newJob.getJobName());
-            jclMap.setFParentId(null == newJob.getParentJob() ? newJob.getParentDept().intValue() + st : newJob.getParentJob().intValue() + sj);
-            jclMap.setFObjParentId(null == newJob.getParentJob() ? newJob.getParentDept().intValue() : newJob.getParentJob().intValue());
-            Integer parentdept = newJob.getParentDept().intValue();
-
-            jclMap.setFClass(0);
-            jclMap.setFClassName("行政维度");
-
-            String currentDate = OrganizationDateUtil.getFormatLocalDate(new java.util.Date());
-            jclMap.setFDateBegin(new Date(OrganizationDateUtil.stringToDate(currentDate).getTime()));
-            jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
-
-            JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.jobfielddefined.getValue().toString(), jclMap.getFObjId().toString());
-
-            // 该岗位有下级岗位时,查询
-            JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, jclMap.getId().toString());
-
-            if (null != jclOrgMapByObjID) {
-                if (null != jclOrgMap) {
-                    StaffPO staffPO = MapperProxyFactory.getProxy(StaffMapper.class).getStaffsByParamId(null,null, jclOrgMapByObjID.getFObjId().toString());
-                    jclMap.setFPlan((null != staffPO ? staffPO.getStaffNum() : 0) + jclOrgMap.getFPlan());
-                    jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob() + jclOrgMap.getFOnJob());
-                } else {
-                    jclMap.setFPlan(jclOrgMapByObjID.getFPlan());
-                    jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob());
-                }
->>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021)
             } else {
                 jclMap.setFPlan(null != staffPO ? staffPO.getStaffNum() : 0);
                 jclMap.setFOnJob(jclOrgMapByObjID.getFOnJob());
@@ -164,7 +125,6 @@ public class JobTriggerRunnable implements Runnable {
         }
         jclMap.setFIsVitual(0);
 
-<<<<<<< HEAD
         Calendar cal = Calendar.getInstance();
         cal.setTime(jclMap.getFDateBegin());
         Calendar calendar = DateUtil.addDay(cal, -1);
@@ -187,27 +147,6 @@ public class JobTriggerRunnable implements Runnable {
         if (null != oldJob) {
             if (null != oldJob.getId()) {
                 updateParentPlanAndJob(jclMap.getFDateBegin(), oldJob.getId().toString());
-=======
-            Calendar cal = Calendar.getInstance();
-            cal.setTime(jclMap.getFDateBegin());
-            Calendar calendar = DateUtil.addDay(cal, -1);
-            Date time = new Date(calendar.getTime().getTime());
-            getCompTriggerMapper().deleteMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin());
-            getCompTriggerMapper().updateMap(jclMap.getFType(), jclMap.getFObjId(), jclMap.getFDateBegin(), time);
-
-            if (1 != newJob.getDeleteType() && 1 != newJob.getForbiddenTag()) {
-                MapperProxyFactory.getProxy(JclOrgMapper.class).insertMap(jclMap);
-                if (null != jclOrgMapByObjID) {
-                    if(null != jclOrgMapByObjID.getFParentId()){
-                        updateParentPlanAndJob(currentDate, jclOrgMapByObjID.getFParentId().toString());
-                    }
-                }
-                if (null != oldJob) {
-                    if (null != oldJob.getId()){
-                        updateParentPlanAndJob(currentDate, oldJob.getId().toString());
-                    }
-                }
->>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021)
             }
         }
 
@@ -260,4 +199,4 @@ public class JobTriggerRunnable implements Runnable {
             }
         }
     }
-}
+}
\ No newline at end of file