...
|
...
|
@@ -360,10 +360,16 @@ func (userService *UserService) GetUser(getUserQuery *query.GetUserQuery) (inter |
|
|
_, org, _ := factory.FastPgOrg(transactionContext, user.OrganizationId)
|
|
|
_, company, _ := factory.FastPgCompany(transactionContext, user.CompanyId)
|
|
|
_, userBase, _ := factory.FastPgUserBase(transactionContext, user.UserBaseId)
|
|
|
if dep != nil && org != nil && userBase != nil {
|
|
|
user.Department = dep.ConvDep()
|
|
|
user.Organization = org.CloneSample()
|
|
|
if company != nil {
|
|
|
user.Company = company.CloneSample()
|
|
|
}
|
|
|
if org != nil {
|
|
|
user.Organization = org.CloneSample()
|
|
|
}
|
|
|
if dep != nil {
|
|
|
user.Department = dep.ConvDep()
|
|
|
}
|
|
|
if userBase != nil {
|
|
|
user.UserInfo = userBase.UserInfo
|
|
|
}
|
|
|
userDto := &dto.UserDto{Im: userBase.Im}
|
...
|
...
|
|