Merge branch 'feature/xgh/0704上线' into 'master'

离职继承的先查离职状态的

See merge request !2000

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

@@ -495,7 +495,7 @@
         wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
         and super_manager_flag is null
         and (wx_user_id = #{wxUserId,jdbcType=VARCHAR} or wx_open_user_id = #{wxUserId,jdbcType=VARCHAR})
-        order by update_time desc,create_time desc limit 1
+        order by status_flag asc , update_time desc,create_time desc limit 1
     </select>
 
     <update id="updateOpenUserIdsByUserId" parameterType="com.gic.haoban.manage.service.entity.TabHaobanStaff">