Merge pull request '代码合并' (#30) from feature/dxf into develop

Reviewed-on: #30

src/com/engine/organization/mapper/staff/StaffMapper.xml

@@ -341,7 +341,6 @@
         inner join jcl_org_staffplan b on a.plan_id = b.id
         WHERE a.delete_type = 0 and b.control_dimension = #{ftype}
         <if test="compId != null">
-<<<<<<< HEAD
             and a.comp_id = #{compId}
         </if>
         <if test="deptId != null">
@@ -349,15 +348,6 @@
         </if>
         <if test="jobId != null">
             and a.job_id = #{jobId}
-=======
-        and t.comp_id = #{compId}
-    </if>
-    <if test="deptId != null">
-        and t.dept_id = #{deptId}
-    </if>
-    <if test="jobId != null">
-        and t.job_id = #{jobId}
->>>>>>> 162e591 (分部转移、部门转移、岗位合并修复1021)
         </if>
     </select>
 </mapper>