fix：bug修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxApplicationMapper.java

@@ -18,4 +18,14 @@ public interface WxApplicationMapper {
                                                                     @Param("applicationType") int applicationType);
 
     int cancelWxApplication(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("suiteId") String suiteId);
+
+    /**
+     * 选择通过公司id
+     *
+     * @param corpid corpid
+     * @return {@link TabHaobanWxApplication }
+     * @author mozhu
+     * @date 2021-12-21 22:00:54
+     */
+    TabHaobanWxApplication selectByCorpId(@Param("corpid") String corpid);
 }
\ No newline at end of file

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

@@ -96,7 +96,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
     @Override
     public void dealQywxEnterpriseHandover(String wxEnterpriseId) {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        logger.info("拉取单个企业微信的离职成员：{}", wxEnterpriseId, JSONObject.toJSONString(wxEnterpriseDTO));
+        logger.info("拉取单个企业微信的离职成员：{},{}", wxEnterpriseId, JSONObject.toJSONString(wxEnterpriseDTO));
         List<QywxUnassignedInfoDTO> allQywxUnassigned = getAllQywxUnassigned(wxEnterpriseDTO);
         logger.info("处理离职成员数量：{},{}", wxEnterpriseId, allQywxUnassigned.size());
         handoverService.saveHandover(wxEnterpriseId, allQywxUnassigned);

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

@@ -34,6 +34,7 @@ import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
+import com.gic.haoban.manage.service.dao.mapper.WxApplicationMapper;
 import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.exception.WxApiLimitException;
 import com.gic.haoban.manage.service.pojo.DealQywxExternalUserPojo;
@@ -124,6 +125,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     @Autowired
     private CustomerApiService customerApiService;
+    @Autowired
+    private WxApplicationMapper wxApplicationMapper;
 
     @Override
     public void dealQywxExternalUser(String params) {
@@ -726,12 +729,24 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     public MemberUnionidRelatedDTO getMemberUnionidRelatedDTONew(MemberUnionidRelatedDTO dto) {
         log.info("【新增外部联系人回调】dto={}", JSON.toJSONString(dto));
         String corpId = dto.getCorpid();
-        TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(corpId);
-        if (wxEnterprise == null) {
-            return null;
+        String wxEnterpriseId = "";
+        //做兼容
+        if (corpId.length() > 20) {
+            TabHaobanWxApplication tabHaobanWxApplication = wxApplicationMapper.selectByCorpId(corpId);
+            if (tabHaobanWxApplication == null) {
+                log.info("查询tab_haoban_wx_application为空：{}", corpId);
+                return null;
+            }
+            wxEnterpriseId = tabHaobanWxApplication.getWxEnterpriseId();
+        } else {
+            TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(corpId);
+            if (wxEnterprise == null) {
+                log.info("查询tab_haoban_wx_enterprise为空：{}", corpId);
+                return null;
+            }
+            wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
         }
         //校验friend
-        String wxEnterpriseId = wxEnterprise.getWxEnterpriseId();
         String userId = dto.getWxUserId();
         String suiteid = dto.getSuiteid();
         ExternalUserDTO externalUserDTO;
@@ -745,7 +760,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("【新增外部联系人回调】unionIdJson=null");
             return null;
         }
-
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setExternalName(EmojiFilterUtil.removeAllEmoji(externalUserDTO.getName()));
         dto.setAddCreateTime(externalUserDTO.getAddCreateTime());
@@ -777,7 +791,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                             mid.setStatusFlag(0);
                             memberUnionRelatedService.update(mid);
                         });
-
             }
             memberUnionRelatedService.update(dto);
             RedisUtil.unlock(lockKey);

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

@@ -189,4 +189,12 @@
           and site_id = #{suiteId}
           and status_flag = 1
     </update>
+
+
+    <select id="selectByCorpId" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_wx_application
+        where corpid = #{corpid,jdbcType=VARCHAR} and status_flag = 1 limit 1
+    </select>
 </mapper>
\ No newline at end of file