代码合并

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

@@ -340,24 +340,14 @@
         select sum(a.staff_num) as staff_num from jcl_org_staff a
         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">
-        and a.dept_id = #{deptId}
-    </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>
+        <if test="compId != null">
+            and a.comp_id = #{compId}
+        </if>
+        <if test="deptId != null">
+            and a.dept_id = #{deptId}
+        </if>
+        <if test="jobId != null">
+            and a.job_id = #{jobId}
+        </if>
     </select>
 </mapper>