Organization

internal/rpc/msg/organization_notification.go

@@ -28,7 +28,7 @@ func OrganizationNotificationToAll(opUserID string, operationID string) {
 	utils2.UserDBCopyOpenIM(tips.OpUser, user)
 
 	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)
 	}
 }

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

@@ -186,7 +186,12 @@ func GetDepartmentMemberList(departmentID string) (error, []db.DepartmentMember)
 		return err, nil
 	}
 	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 {
 		return err, nil
 	}