diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index 1d7e610ac..6f3f0b15f 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -147,7 +147,7 @@ func joinGroups(operationID, userID, userName string, groupIDList []string) { GroupID: groupID, Reason: "register auto join", InvitedUserIDList: []string{userID}, - OpUserID: userID, + OpUserID: config.Config.Manager.AppManagerUid[0], } resp, err := client.InviteUserToGroup(context.Background(), req) if err != nil { diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index ea2e768fa..fb7a0ab18 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -249,10 +249,14 @@ func GetDepartmentRelatedGroupIDList(departmentIDList []string) ([]string, error func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, error) { var department db.Department + var parentDepartment db.Department //var parentID string dbConn.LogMode(true) - dbConn.Model(&department).Where("department_id=?", departmentID).Select("parent_id").First(&department) - err := dbConn.Model(&department).Where("department_id = ?", department.ParentID).Find(&department).Error + err := dbConn.Model(&department).Where("department_id=?", departmentID).Select("parent_id").First(&department).Error + if err != nil { + return nil, utils.Wrap(err, "") + } + err = dbConn.Model(&parentDepartment).Where("department_id = ?", department.ParentID).Find(&parentDepartment).Error return &department, err } @@ -261,7 +265,7 @@ func GetDepartmentParent(departmentID string, dbConn *gorm.DB, parentIDList *[]s if err != nil { return err } - if department.ParentID != "" { + if department.DepartmentID != "" { *parentIDList = append(*parentIDList, department.ParentID) err = GetDepartmentParent(departmentID, dbConn, parentIDList) if err != nil {