Merge branch 'developer' into 'master'

Developer

See merge request !348

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -1203,6 +1203,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         TabHaobanStaff staff = this.staffMapper.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
+        if(null==staff) {
+            log.info("成员未查到,userid={}",wxUserId);
+            return ;
+        }
         String staffId = staff.getStaffId();
         dto.setStaffId(staffId);
         externalClerkRelatedService.delByUserIdAndExternalUserId(dto);

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

@@ -34,21 +34,22 @@
     </insert>
     
     <select id="getBySelfExternalUserId" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from tab_haoban_member_unionid_related
-        where wx_enterprise_id = #{wxEnterpriseId}
-        and status_flag = 1
-         <if test="staffId == null">
-            and ( self_external_userid = #{selfExternalUserId} or external_userid = #{selfExternalUserId} )
+        select <include refid="Base_Column_List"/>
+       	from tab_haoban_member_unionid_related  where wx_enterprise_id = #{wxEnterpriseId}  and status_flag = 1
+           and self_external_userid = #{selfExternalUserId}
+        <if test="staffId != null">
+         and staff_id = #{staffId}
         </if>
-      
+           union 
+           select <include refid="Base_Column_List"/>
+       	from tab_haoban_member_unionid_related  where wx_enterprise_id = #{wxEnterpriseId}  and status_flag = 1
+           and external_userid = #{selfExternalUserId}
         <if test="staffId != null">
-           and ( self_external_userid = #{selfExternalUserId})
-            and staff_id = #{staffId}
+         and staff_id = #{staffId}
         </if>
-        order by create_time desc limit 1
+           order by create_time desc limit 1
     </select>
+    
 
     <select id="listByWxEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
     	select

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

@@ -682,7 +682,7 @@
         	<foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
             	#{id}
         	</foreach>
-          and enterprise_id = #{enterpriseId} and status_flag = 1
+          and status_flag = 1
     </update>
     
     <select id="listPageByWxenterpriseId" resultMap="BaseResultMap">