Merge branch 'master' into developer

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

@@ -288,7 +288,7 @@
         b.department_id departmentIds
         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}
+        where a.status_flag = 1 and b.status_flag = 1 and a.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>
@@ -514,7 +514,7 @@
         update tab_haoban_staff
         set add_num = add_num +1,
             update_time     = now()
-        where staff_id = #{staffId}
+        where staff_id = #{staffId} and status_flag = 1
     </update>
 
 
@@ -531,6 +531,7 @@
         <set>
             add_num = 0,update_time = now()
         </set>
+        where status_flag = 1
     </update>
 
 </mapper>
\ No newline at end of file