diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index 180b17c93..1d7e610ac 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -34,7 +34,7 @@ func onboardingProcess(operationID, userID, userName string) { log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) } log.NewInfo(operationID, utils.GetSelfFuncName(), groupIDList) - //joinGroups(operationID, userID, userName, groupIDList) + joinGroups(operationID, userID, userName, groupIDList) log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed") } @@ -120,19 +120,19 @@ func GetDepartmentGroupIDList(operationID, departmentID string) ([]string, error log.NewError(req.OperationID, utils.GetSelfFuncName(), resp) return nil, errors.New(resp.ErrMsg) } - return resp.ParentIDList, nil - //resp.ParentIDList = append(resp.ParentIDList, departmentID) - //getDepartmentRelatedGroupIDListReq := organizationRpc.GetDepartmentRelatedGroupIDListReq{OperationID: operationID, DepartmentIDList: resp.ParentIDList} - //getDepartmentParentIDListResp, err := client.GetDepartmentRelatedGroupIDList(context.Background(), &getDepartmentRelatedGroupIDListReq) - //if err != nil { - // log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), getDepartmentRelatedGroupIDListReq.String()) - // return nil, err - //} - //if getDepartmentParentIDListResp.ErrCode != 0 { - // log.NewError(req.OperationID, utils.GetSelfFuncName(), getDepartmentParentIDListResp) - // return nil, errors.New(getDepartmentParentIDListResp.ErrMsg) - //} - //return getDepartmentParentIDListResp.GroupIDList, nil + + resp.ParentIDList = append(resp.ParentIDList, departmentID) + getDepartmentRelatedGroupIDListReq := organizationRpc.GetDepartmentRelatedGroupIDListReq{OperationID: operationID, DepartmentIDList: resp.ParentIDList} + getDepartmentParentIDListResp, err := client.GetDepartmentRelatedGroupIDList(context.Background(), &getDepartmentRelatedGroupIDListReq) + if err != nil { + log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), getDepartmentRelatedGroupIDListReq.String()) + return nil, err + } + if getDepartmentParentIDListResp.ErrCode != 0 { + log.NewError(req.OperationID, utils.GetSelfFuncName(), getDepartmentParentIDListResp) + return nil, errors.New(getDepartmentParentIDListResp.ErrMsg) + } + return getDepartmentParentIDListResp.GroupIDList, nil } func joinGroups(operationID, userID, userName string, groupIDList []string) { 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 039da3573..649d0f7d3 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 @@ -251,9 +251,8 @@ func getDepartmentParent(departmentID string, dbConn *gorm.DB) (*db.Department, var department db.Department //var parentID string dbConn.LogMode(true) - var parentID int - dbConn.Model(&department).Where("department_id=?", departmentID).Pluck("parent_id", &parentID) - err := dbConn.Model(&department).Where("department_id = ?", parentID).Find(&department).Error + dbConn.Model(&department).Where("department_id=?", departmentID).Select("parent_id").First(&department) + err := dbConn.Model(&department).Where("department_id = ?", department.DepartmentID).Find(&department).Error return &department, err }