From eed59f468c344755f67548d279df647b83eb8dae Mon Sep 17 00:00:00 2001
From: hrxiang <xianghairui@126.com>
Date: Mon, 7 Nov 2022 10:32:05 +0800
Subject: [PATCH] Fix bug

---
 CHANGELOG.md                          |  5 +++++
 android/build.gradle                  |  8 +++-----
 lib/src/models/organization_info.dart | 23 +++++++++++++++++++++--
 pubspec.yaml                          |  2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4128cbf..0fe0352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.3.4+4
+
+- Fix bug
+- Replace maven repository address
+
 ## 2.3.4+3
 
 - Fix bug
diff --git a/android/build.gradle b/android/build.gradle
index 041d3ab..ff96abe 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -4,8 +4,7 @@ version '1.0'
 buildscript {
     repositories {
         maven {
-            url 'http://121.37.25.71:8081/repository/maven2/'
-            allowInsecureProtocol = true
+            url 'https://open-im-online.rentsoft.cn:51000/repository/maven2/'
         }
         google()
         mavenCentral()
@@ -19,8 +18,7 @@ buildscript {
 rootProject.allprojects {
     repositories {
         maven {
-            url 'http://121.37.25.71:8081/repository/maven2/'
-            allowInsecureProtocol = true
+            url 'https://open-im-online.rentsoft.cn:51000/repository/maven2/'
         }
         google()
         mavenCentral()
@@ -41,5 +39,5 @@ android {
     }
 }
 dependencies {
-    implementation 'io.openim:core-sdk:2.3.4-rc0@aar'
+    implementation 'io.openim:core-sdk:2.3.4-rc2@aar'
 }
\ No newline at end of file
diff --git a/lib/src/models/organization_info.dart b/lib/src/models/organization_info.dart
index 01b5c0d..10dc2da 100644
--- a/lib/src/models/organization_info.dart
+++ b/lib/src/models/organization_info.dart
@@ -33,6 +33,8 @@ class DeptInfo {
   /// 附加信息
   String? attachedInfo;
 
+  String? relatedGroupID;
+
   DeptInfo(
       {this.departmentID,
       this.faceURL,
@@ -44,7 +46,8 @@ class DeptInfo {
       this.subDepartmentNum,
       this.memberNum,
       this.ex,
-      this.attachedInfo});
+      this.attachedInfo,
+      this.relatedGroupID});
 
   DeptInfo.fromJson(Map<String, dynamic> json) {
     departmentID = json['departmentID'];
@@ -58,6 +61,7 @@ class DeptInfo {
     memberNum = json['memberNum'];
     ex = json['ex'];
     attachedInfo = json['attachedInfo'];
+    relatedGroupID = json['relatedGroupID'];
   }
 
   Map<String, dynamic> toJson() {
@@ -73,6 +77,7 @@ class DeptInfo {
     data['memberNum'] = this.memberNum;
     data['ex'] = this.ex;
     data['attachedInfo'] = this.attachedInfo;
+    data['relatedGroupID'] = this.relatedGroupID;
     return data;
   }
 
@@ -134,6 +139,12 @@ class DeptMemberInfo {
   /// 创建时间
   int? createTime;
 
+  /// 入职时间
+  int? entryTime;
+
+  /// 离职时间
+  int? terminationTime;
+
   /// 扩展字段
   String? ex;
 
@@ -146,6 +157,9 @@ class DeptMemberInfo {
   /// 所在部门的所有上级部门
   List<DeptInfo>? parentDepartmentList;
 
+  /// 当前部门信息
+  DeptInfo? department;
+
   DeptMemberInfo({
     this.userID,
     this.nickname,
@@ -166,6 +180,7 @@ class DeptMemberInfo {
     this.attachedInfo,
     this.departmentName,
     this.parentDepartmentList,
+    this.department,
   });
 
   DeptMemberInfo.fromJson(Map<String, dynamic> json) {
@@ -193,6 +208,9 @@ class DeptMemberInfo {
         parentDepartmentList!.add(DeptInfo.fromJson(v));
       });
     }
+    department = json['department'] == null
+        ? null
+        : DeptInfo.fromJson(json['department']);
   }
 
   Map<String, dynamic> toJson() {
@@ -219,6 +237,7 @@ class DeptMemberInfo {
       data['parentDepartmentList'] =
           this.parentDepartmentList!.map((v) => v.toJson()).toList();
     }
+    data['department'] = this.department?.toJson();
     return data;
   }
 
@@ -263,7 +282,7 @@ class UserInDept {
   }
 }
 
-/// 部门下的子部门跟员工
+/// 部门下的一级子部门跟员工
 class DeptMemberAndSubDept {
   /// 一级子部门
   List<DeptInfo>? departmentList;
diff --git a/pubspec.yaml b/pubspec.yaml
index a1da7ea..239de73 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_openim_sdk
 description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source.
-version: 2.3.4+3
+version: 2.3.4+4
 homepage: https://www.rentsoft.cn
 repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter