Merge remote-tracking branch 'origin/developer' into developer

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

@@ -295,7 +295,7 @@
         </if>
         where a.wx_enterprise_id = #{wxEnterpriseId} 
         <if test="occupy == null or 1!=occupy">
-	        a.status_flag = 1
+	        and a.status_flag = 1
         </if>
         <if test="keyword != null and keyword != ''">
             and (a.staff_name like CONCAT('%',#{keyword},'%') or a.phone_number like CONCAT('%',#{keyword},'%'))