blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-05 20:11:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Organization

Browse Source
This commit is contained in:
skiffer-git 2022-04-19 20:57:59 +08:00 committed by Xinwei Xiong(cubxxw-openim)
parent efcf466c7d
commit 53281eef3d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/msg/organization_notification.go
View File

@ -28,7 +28,7 @@ func OrganizationNotificationToAll(opUserID string, operationID string) {
utils2.UserDBCopyOpenIM(tips.OpUser, user) utils2.UserDBCopyOpenIM(tips.OpUser, user)
for _, v := range userIDList { for _, v := range userIDList {
log.Debug(operationID, opUserID, v, constant.OrganizationChangedNotification, &tips, operationID) log.Debug(operationID, "OrganizationNotification", opUserID, v, constant.OrganizationChangedNotification, &tips, operationID)
OrganizationNotification(opUserID, v, constant.OrganizationChangedNotification, &tips, operationID) OrganizationNotification(opUserID, v, constant.OrganizationChangedNotification, &tips, operationID)
} }
} }

7
pkg/common/db/mysql_model/im_mysql_model/organization_model.go
View File

@ -186,7 +186,12 @@ func GetDepartmentMemberList(departmentID string) (error, []db.DepartmentMember)
return err, nil return err, nil
} }
var departmentMemberList []db.DepartmentMember var departmentMemberList []db.DepartmentMember
err = dbConn.Table("department_members").Where("department_id=?", departmentID).Find(&departmentMemberList).Error if departmentID == "-1" {
err = dbConn.Table("department_members").Find(&departmentMemberList).Error
} else {
err = dbConn.Table("department_members").Where("department_id=?", departmentID).Find(&departmentMemberList).Error
}
if err != nil { if err != nil {
return err, nil return err, nil
} }