fix：加好友bug修改

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

@@ -375,7 +375,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             checkQywxSettingApiService.saveFriendCallback(wxEnterpriseId, null, dto);
             return;
         }
-
         TabHaobanStaff staff = staffService.selectByCorpidAndUserIdAndEnterpriseId(corpid, wxUserId, wxEnterpriseId);
         if (staff == null) {
             log.info("staff不存在：{},{}", dto.getUnionid(), dto.getWxUserId());
@@ -402,9 +401,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("未查询到企业：wxEnterpriseId:{}", wxEnterpriseId);
             return;
         }
+        //需从表中重新查询一次，不能使用回调过来的数据
+        corpid = wxEnterpriseDTO.getCorpid();
         if (corpid.length() < 20) {
             Integer agreeExternalUseridFlag = wxEnterpriseDTO.getAgreeExternalUseridFlag();
-            log.info("加好友判断新旧的逻辑，corpid：{},agreeExternalUseridFlag：{}", agreeExternalUseridFlag, corpid);
+            log.info("加好友判断新旧的逻辑，corpid：{},agreeExternalUseridFlag：{}", corpid, agreeExternalUseridFlag);
             if (agreeExternalUseridFlag != null && agreeExternalUseridFlag == 1) {
                 log.info("同意直接走，发送欢迎语逻辑：wxEnterpriseId:{}", wxEnterpriseId);
                 addFriendByWelcome(dto, staffClerkRelationDTO);
@@ -522,6 +523,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         return null;
     }
 
+
     /**
      * 发送欢迎语
      *
@@ -530,7 +532,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param sendApp
      */
     private void sendWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO, boolean sendApp) {
-        log.info("发送欢迎语：{}", JSONObject.toJSONString(staffClerkRelationDTO));
+        log.info("发送欢迎语：dto:{},staffClerkRelationDTO:{},sendApp:{}", JSONObject.toJSONString(dto), JSONObject.toJSONString(staffClerkRelationDTO), sendApp);
         String relationKey = SecureUtil.md5(staffClerkRelationDTO.getClerkId() + dto.getExternalUserid());
         String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId();
         TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(wxEnterpriseId);