organization

pkg/common/config/config.go

@@ -309,6 +309,11 @@ type config struct {
 			OfflinePush  POfflinePush  `yaml:"offlinePush"`
 			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
 		} `yaml:"groupMemberInfoSet"`
+		OrganizationChanged struct {
+			Conversation PConversation `yaml:"conversation"`
+			OfflinePush  POfflinePush  `yaml:"offlinePush"`
+			DefaultTips  PDefaultTips  `yaml:"defaultTips"`
+		} `yaml:"organizationChanged"`
 
 		////////////////////////user///////////////////////
 		UserInfoUpdated struct {

pkg/common/db/mysql_model/im_mysql_model/organization_model.go

@@ -44,7 +44,12 @@ func GetSubDepartmentList(departmentID string) (error, []db.Department) {
 		return err, nil
 	}
 	var departmentList []db.Department
-	err = dbConn.Table("departments").Where("parent_id=?", departmentID).Find(&departmentList).Error
+	if departmentID == "-1" {
+		err = dbConn.Table("departments").Find(&departmentList).Error
+	} else {
+		err = dbConn.Table("departments").Where("parent_id=?", departmentID).Find(&departmentList).Error
+	}
+
 	return err, departmentList
 }
 
@@ -187,3 +192,13 @@ func GetDepartmentMemberList(departmentID string) (error, []db.DepartmentMember)
 	}
 	return err, departmentMemberList
 }
+
+func GetAllOrganizationUserID() (error, []string) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return err, nil
+	}
+	var OrganizationUser db.OrganizationUser
+	var result []string
+	return dbConn.Model(&OrganizationUser).Pluck("user_id", &result).Error, result
+}

pkg/proto/sdk_ws/ws.proto

@@ -358,6 +358,13 @@ message GroupMemberInfoSetTips{
   GroupMemberFullInfo changedUser = 4;
 }
 
+
+message OrganizationChangedTips{
+  UserInfo opUser = 2;
+  int64 operationTime = 3;
+}
+
+
 //////////////////////friend/////////////////////
 //message FriendInfo{
 //  UserInfo OwnerUser = 1;