Merge branch 'feature-2022_03_02' into developer

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

@@ -1351,10 +1351,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String corpid = enterprise.getCorpid();
         String userId = "";
         TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId);
-        if (staff != null && StringUtils.isNotBlank(staff.getWxOpenUseId())) {
+        if (staff == null) {
+            log.error("员工为空，wxUserId：{}", wxUserId);
+            return null;
+        }
+        if (corpid.length() > 20) {
             userId = staff.getWxOpenUseId();
         } else {
-            userId = wxUserId;
+            userId = staff.getWxUserId();
         }
         log.info("【获取第三方应用好友】wxEnterpriseId={},userId={}", wxEnterpriseId, userId);
         String wxRes = qywxUserApiService.listExternalUserid(corpid, config.getWxSuiteid(), userId);