切换导航条
此项目
正在载入...
登录
allied-creation
/
performance
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Your Name
2 years ago
提交
2c77f99ba649efb211d6386f59ecba5f689a24e3
1 个父辈
88956ae2
修复一些问题
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
25 行增加
和
19 行删除
pkg/application/staff_assess/service/service.go
pkg/infrastructure/repository/pg_user_repository.go
pkg/application/staff_assess/service/service.go
查看文件 @
2c77f99
...
...
@@ -570,12 +570,12 @@ func (srv StaffAssessServeice) createStaffAssessSelf(assessTemp domain.StaffAsse
assessTemp
.
TargetUser
=
domain
.
StaffDesc
{
UserId
:
int
(
usr
.
Id
),
Account
:
usr
.
Account
,
UserName
:
usr
.
Account
,
UserName
:
usr
.
Name
,
}
assessTemp
.
Executor
=
domain
.
StaffDesc
{
UserId
:
int
(
usr
.
Id
),
Account
:
usr
.
Account
,
UserName
:
usr
.
Account
,
UserName
:
usr
.
Name
,
}
if
depList
,
ok
:=
userDepartmentMap
[
usr
.
Id
];
ok
{
for
_
,
dep
:=
range
depList
{
...
...
pkg/infrastructure/repository/pg_user_repository.go
查看文件 @
2c77f99
...
...
@@ -28,12 +28,14 @@ func (repo *UserRepository) Insert(user *domain.User) (*domain.User, error) {
AvatarUrl
:
user
.
AvatarUrl
,
CompanyId
:
user
.
CompanyId
,
AdminType
:
user
.
AdminType
,
DepartmentId
:
user
.
DepartmentId
,
PositionId
:
user
.
PositionId
,
Name
:
user
.
Name
,
Email
:
user
.
Email
,
Status
:
user
.
Status
,
UpdatedAt
:
user
.
UpdatedAt
,
DepartmentId
:
user
.
DepartmentId
,
PositionId
:
user
.
PositionId
,
EntryTime
:
user
.
EntryTime
,
CreatedAt
:
user
.
CreatedAt
,
UpdatedAt
:
user
.
UpdatedAt
,
DeletedAt
:
user
.
DeletedAt
,
}
tx
:=
repo
.
transactionContext
.
PgTx
...
...
@@ -52,13 +54,14 @@ func (repo *UserRepository) Update(user *domain.User) (*domain.User, error) {
AvatarUrl
:
user
.
AvatarUrl
,
CompanyId
:
user
.
CompanyId
,
AdminType
:
user
.
AdminType
,
DepartmentId
:
user
.
DepartmentId
,
PositionId
:
user
.
PositionId
,
Name
:
user
.
Name
,
Email
:
user
.
Email
,
Status
:
user
.
Status
,
UpdatedAt
:
user
.
UpdatedAt
,
DepartmentId
:
user
.
DepartmentId
,
PositionId
:
user
.
PositionId
,
EntryTime
:
user
.
EntryTime
,
CreatedAt
:
user
.
CreatedAt
,
UpdatedAt
:
user
.
UpdatedAt
,
DeletedAt
:
user
.
DeletedAt
,
}
tx
:=
repo
.
transactionContext
.
PgTx
...
...
@@ -139,16 +142,19 @@ func (repo *UserRepository) Find(queryOptions map[string]interface{}) (int, []*d
func
(
repo
*
UserRepository
)
TransformToUserDomain
(
user
*
models
.
User
)
*
domain
.
User
{
return
&
domain
.
User
{
Id
:
user
.
Id
,
Account
:
user
.
Account
,
AvatarUrl
:
user
.
AvatarUrl
,
CompanyId
:
user
.
CompanyId
,
AdminType
:
user
.
AdminType
,
Name
:
user
.
Name
,
Email
:
user
.
Email
,
Status
:
user
.
Status
,
UpdatedAt
:
user
.
UpdatedAt
,
CreatedAt
:
user
.
CreatedAt
,
DeletedAt
:
user
.
DeletedAt
,
Id
:
user
.
Id
,
Account
:
user
.
Account
,
AvatarUrl
:
user
.
AvatarUrl
,
CompanyId
:
user
.
CompanyId
,
AdminType
:
user
.
AdminType
,
Name
:
user
.
Name
,
Email
:
user
.
Email
,
Status
:
user
.
Status
,
DepartmentId
:
user
.
DepartmentId
,
PositionId
:
user
.
PositionId
,
EntryTime
:
user
.
EntryTime
,
UpdatedAt
:
user
.
UpdatedAt
,
DeletedAt
:
user
.
DeletedAt
,
CreatedAt
:
user
.
CreatedAt
,
}
}
...
...
请
注册
或
登录
后发表评论