Merge branch 'fix-02-21_group_send' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

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

@@ -151,13 +151,13 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         ServiceResponse<ExternalClerkRelatedDTO> resp = new ServiceResponse<>();
         TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByRelationKey(relationKey);
         if (null == externalClerkRelated) {
-            log.error("relationKey对应的关联关系不存在或删除：relationKey:{},memberId:{},unionid:{}",relationKey,memberId,unionid);
+            log.error("relationKey对应的关联关系不存在或删除：relationKey:{},memberId:{},unionid:{}", relationKey, memberId, unionid);
             resp.setCode(0);
             resp.setMessage("relationKey对应的关联关系不存在或删除");
             return resp;
         }
         if (!externalClerkRelated.getEnterpriseId().equals(enterpriseId)) {
-            log.error("relationKey对应的企业与所传会员企业不对应：relationKey:{},memberId:{},unionid:{}",relationKey,memberId,unionid);
+            log.error("relationKey对应的企业与所传会员企业不对应：relationKey:{},memberId:{},unionid:{}", relationKey, memberId, unionid);
             resp.setCode(0);
             resp.setMessage("relationKey对应的企业与所传会员企业不对应");
             return resp;
@@ -302,7 +302,13 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
         if (corpid.length() > 20) {
             res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
         } else {
-            res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
+            // 兼容转换
+            if (tabHaobanWxEnterprise.getExternalFlag() == 1) {
+                // 转换成功
+                res = staffClerkRelationMapper.listMemberStaffRelNew(memberIdList, clerkIdList, enterpriseId);
+            } else {
+                res = staffClerkRelationMapper.listMemberStaffRel(memberIdList, clerkIdList, enterpriseId);
+            }
         }
         if (CollectionUtils.isEmpty(res)) {
             return Collections.emptyMap();