Merge branch 'feature/xgh/0704上线' into 'master'

自建离职继承add_way

See merge request !2029

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

@@ -1068,6 +1068,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String externalUserId = "";
         String state = "";
         int friendType = 1;
+        Integer addWay = 0 ;
         if (StringUtils.isNotBlank(unionIdJson)) {
             JSONObject jo = JSON.parseObject(unionIdJson);
             String external_contact = jo.getString("external_contact");
@@ -1093,6 +1094,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     state = follow.getString("state");
                     if (userId.equals(userId1)) {
                         createTime = follow.getString("createtime");
+                        addWay = follow.getIntValue("add_way") ;
                     }
                 }
             }
@@ -1105,6 +1107,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         pojo.setWxEnterpriseId(wxEnterpriseId);
         pojo.setState(state);
         pojo.setFriendType(friendType);
+        pojo.setAddWay(addWay);
         return pojo;
     }