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

fix bug

Browse Source
This commit is contained in:
wangchuxiao 2022-06-08 19:06:22 +08:00
parent 6055ce9b6b
commit da18950b3d
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/demo/register/onboarding_process.go
View File

@ -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) {

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

@ -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
}