切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
2 years ago
提交
467a93349111dde3e3b84cdfaa0eb0f8435b150b
1 个父辈
7eee95b6
暂存
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
49 行增加
和
36 行删除
pkg/application/staff_assess/service/service.go
pkg/application/staff_assess/service/service.go
查看文件 @
467a933
...
...
@@ -1592,36 +1592,37 @@ func (srv *StaffAssessServeice) getStaffDescrip(transactionContext application.T
log
.
Logger
.
Error
(
"获取公司信息,"
+
err
.
Error
())
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
"获取公司信息,"
+
err
.
Error
())
}
departmentRepo
:=
factory
.
CreateDepartmentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
// departmentRepo := factory.CreateDepartmentRepository(map[string]interface{}{
// "transactionContext": transactionContext,
// })
// //查找员工的部门
// var departmentList []*domain.Department
// if len(userData.DepartmentId) > 0 {
// }
var
supperUserList
[]
*
domain
.
User
if
len
(
userData
.
DepartmentId
)
>
0
{
_
,
departmentList
,
err
:=
departmentRepo
.
Find
(
map
[
string
]
interface
{}{
"ids"
:
userData
.
DepartmentId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
"获取部门信息,"
+
err
.
Error
())
}
var
chargeUserIds
[]
int64
for
_
,
v
:=
range
departmentList
{
chargeUserIds
=
append
(
chargeUserIds
,
v
.
ChargeUserIds
...
)
}
if
len
(
chargeUserIds
)
>
0
{
_
,
supperUserList
,
err
=
userRepo
.
Find
(
map
[
string
]
interface
{}{
"ids"
:
chargeUserIds
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
"获取员工上级信息,"
+
err
.
Error
())
}
}
}
// var supperUserList []*domain.User
// if len(userData.DepartmentId) > 0 {
// _, departmentList, err := departmentRepo.Find(map[string]interface{}{
// "ids": userData.DepartmentId,
// })
// if err != nil {
// return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取部门信息,"+err.Error())
// }
// var chargeUserIds []int64
// for _, v := range departmentList {
// chargeUserIds = append(chargeUserIds, v.ChargeUserIds...)
// }
// if len(chargeUserIds) > 0 {
// _, supperUserList, err = userRepo.Find(map[string]interface{}{
// "ids": chargeUserIds,
// })
// if err != nil {
// return nil, application.ThrowError(application.TRANSACTION_ERROR, "获取员工上级信息,"+err.Error())
// }
// }
// }
supperUserList
,
_
:=
srv
.
getStaffSuper
(
transactionContext
,
*
userData
)
userInfo
:=
adapter
.
StaffInfo
{
UserName
:
userData
.
Name
,
CompanyName
:
companyData
.
Name
,
...
...
@@ -1719,7 +1720,6 @@ func (srv StaffAssessServeice) SaveAssessInfo(param *command.SaveAssessInfoComma
}
}
//保存信息
for
i
:=
range
assessContentList
{
_
,
err
=
assessContentRepo
.
Save
(
assessContentList
[
i
])
...
...
@@ -1774,7 +1774,7 @@ func (srv StaffAssessServeice) ListTargetUserAssess(param *query.ListTargetUserA
}
//获取员工的上级是谁 ,TODO
func
(
srv
StaffAssessServeice
)
getStaffSuper
(
transactionContext
application
.
TransactionContext
,
targetUser
domain
.
User
)
([]
domain
.
User
,
error
)
{
func
(
srv
StaffAssessServeice
)
getStaffSuper
(
transactionContext
application
.
TransactionContext
,
targetUser
domain
.
User
)
([]
*
domain
.
User
,
error
)
{
departmentRepo
:=
factory
.
CreateDepartmentRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
...
...
@@ -1793,6 +1793,28 @@ func (srv StaffAssessServeice) getStaffSuper(transactionContext application.Tran
}
}
if
len
(
departmemtList
)
==
0
{
companyRepo
:=
factory
.
CreateCompanyRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
})
companyData
,
err
:=
companyRepo
.
FindOne
(
map
[
string
]
interface
{}{
"id"
:
targetUser
.
CompanyId
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取员工的公司"
+
err
.
Error
())
}
//公司作为最顶级
departmemtList
=
append
(
departmemtList
,
&
domain
.
Department
{
Id
:
0
,
CompanyId
:
companyData
.
Id
,
Level
:
0
,
Name
:
companyData
.
Name
,
ParentId
:
0
,
ChargeUserIds
:
companyData
.
ChargeUserIds
,
Path
:
""
,
CreatedAt
:
time
.
Time
{},
UpdatedAt
:
time
.
Time
{},
DeletedAt
:
&
time
.
Time
{},
})
}
//获取部门管理员
...
...
@@ -1836,14 +1858,5 @@ loop:
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"获取主管员工数据"
+
err
.
Error
())
}
}
if
len
(
chargeUserList
)
==
0
{
//如果都找不到数据
}
// _, chargeUserList, err := userRepo.Find(map[string]interface{}{
// "ids": chargeUserIds,
// })
return
nil
,
nil
return
chargeUserList
,
nil
}
...
...
请
注册
或
登录
后发表评论