From 40f1f097e6f1f6724363dcb05542c8f55f0e4d61 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Fri, 28 Oct 2022 10:35:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/mapper/staff/StaffMapper.xml | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml
index c7e96731..41fb3eb3 100644
--- a/src/com/engine/organization/mapper/staff/StaffMapper.xml
+++ b/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>
\ No newline at end of file