Merge branch 'master' into developer

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

@@ -289,7 +289,6 @@
         from tab_haoban_staff a
         left join tab_haoban_staff_department_related b on a.staff_id = b.staff_id
         where a.status_flag = 1 and a.wx_enterprise_id = #{wxEnterpriseId}
-        and b.status_flag = 1 and b.wx_enterprise_id = #{wxEnterpriseId}
         <if test="keyword != null and keyword != ''">
             and (a.staff_name like CONCAT('%',#{keyword},'%') or a.phone_number like CONCAT('%',#{keyword},'%'))
         </if>