Merge branch 'developer' into 'master'

test

See merge request !347

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

@@ -39,8 +39,12 @@
         from tab_haoban_member_unionid_related
         where wx_enterprise_id = #{wxEnterpriseId}
         and status_flag = 1
-        and ( self_external_userid = #{selfExternalUserId} or external_userid = #{selfExternalUserId} )
+         <if test="staffId == null">
+            and ( self_external_userid = #{selfExternalUserId} or external_userid = #{selfExternalUserId} )
+        </if>
+      
         <if test="staffId != null">
+           and ( self_external_userid = #{selfExternalUserId})
             and staff_id = #{staffId}
         </if>
         order by create_time desc limit 1