Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -347,7 +347,7 @@
     status_flag = 0,
 
     update_time = now()
-    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1 and super_manager_flag!=1
+    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1 and super_manager_flag is not null
     and staff_id not in
     <foreach collection="staffIds" item="item" open="(" separator="," close=")">
       #{item}
@@ -367,7 +367,7 @@
   <select id="listUserStaffId" resultType="string">
     select staff_id  FROM tab_haoban_staff
     WHERE
-      wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1 and super_manager_flag!=1
+      wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR} and status_flag = 1 and super_manager_flag is not null
     and staff_id not in
     <foreach collection="staffIds" item="item" open="(" separator="," close=")">
       #{item}