Merge branch 'fixbug_0914' into 'master'

导出无部门bug

See merge request !235

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -281,6 +281,9 @@
     <select id="pageStaff" resultMap="BaseResultMap">
         select
         a.*
+        <if test="departmentIds != null and departmentIds.size() > 0">
+	        , b.department_id departmentIds
+        </if>
         from tab_haoban_staff a
         <if test="departmentIds != null and departmentIds.size() > 0">
 	        left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id  and b.status_flag = 1