切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
5 years ago
提交
f987cfe213b3a8359de6b7210588ae0844a83348
1 个父辈
9c8752d7
master
...
dev
feature/multi-miniprogram
master20210315
master20210622
test
v0.8.0-dev
0.9.2
0.9.1
0.9.0
0.8.0
0.7.0
0.5.0
0.5.0-1
0.4.0
0.3.0
0.3.0-1
修复错误
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
11 行增加
和
7 行删除
pkg/application/unifiedUserCenter/service/company.go
pkg/application/unifiedUserCenter/service/employee.go
pkg/application/unifiedUserCenter/service/service.go
pkg/infrastructure/dao/pg_admin_user_dao.go
pkg/application/unifiedUserCenter/service/company.go
查看文件 @
f987cfe
...
...
@@ -200,6 +200,7 @@ func (service SyncCompanyService) updateCompany(data CompanytData) error {
"Remarks"
:
data
.
User
.
Remarks
,
"ChargeStatus"
:
data
.
User
.
ChargeStatus
,
"EntryTime"
:
entryTime
,
"AdminType"
:
data
.
User
.
AdminType
,
})
err
=
companyRespository
.
Edit
(
&
oldCompany
)
if
err
!=
nil
{
...
...
@@ -240,7 +241,7 @@ func (service SyncCompanyService) updateCompanyCharge(data CompanyCharge) error
})
for
i
:=
range
oldUsers
{
_
=
oldUsers
[
i
]
.
Update
(
map
[
string
]
interface
{}{
"
charge_s
tatus"
:
domain
.
UserIsNotCompanyCharge
,
"
ChargeS
tatus"
:
domain
.
UserIsNotCompanyCharge
,
})
err
=
userRespository
.
Edit
(
&
oldUsers
[
i
])
if
err
!=
nil
{
...
...
@@ -256,7 +257,7 @@ func (service SyncCompanyService) updateCompanyCharge(data CompanyCharge) error
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
fmt
.
Sprintf
(
"获取用户(id=%d)的数据失败:%s"
,
v
,
err
.
Error
()))
}
_
=
userToUpdate
.
Update
(
map
[
string
]
interface
{}{
"
charge_s
tatus"
:
domain
.
UserIsCompanyCharge
,
"
ChargeS
tatus"
:
domain
.
UserIsCompanyCharge
,
})
err
=
userRespository
.
Edit
(
&
userToUpdate
)
if
err
!=
nil
{
...
...
pkg/application/unifiedUserCenter/service/employee.go
查看文件 @
f987cfe
...
...
@@ -192,6 +192,7 @@ func (service SyncEmployeeService) addEmployeeData(datas []EmployeeData) error {
ChargeStatus
:
data
.
ChargeStatus
,
Permission
:
[]
domain
.
AdminPermissionBase
{},
//初始化权限
AccessPartners
:
[]
domain
.
Partner
{},
//默认初始化
AdminType
:
data
.
AdminType
,
}
newUser
.
EntryTime
,
_
=
time
.
Parse
(
"2006-01-02"
,
data
.
EntryTime
)
if
err
=
usersRepository
.
Add
(
&
newUser
);
err
!=
nil
{
...
...
@@ -244,6 +245,7 @@ func (service SyncEmployeeService) updateEmployeeData(datas []EmployeeData) erro
"Remarks"
:
data
.
Remarks
,
"ChargeStatus"
:
data
.
ChargeStatus
,
"EntryTime"
:
entryTime
,
"AdminType"
:
data
.
AdminType
,
})
if
err
=
usersRepository
.
Edit
(
&
oldUser
);
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
...
...
@@ -369,14 +371,14 @@ func (service SyncEmployeeService) ChangeSuperAdmin(cmd command.ChanceSuperAdmin
}
err
=
usersRepository
.
Edit
(
&
oldSuperUser
)
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"更新公司主管user数据(id=%d)"
,
oldSuperUser
.
Id
)
e
:=
fmt
.
Sprintf
(
"更新公司主管user数据(id=%d)失败:%s"
,
oldSuperUser
.
Id
,
err
)
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
e
)
}
err
=
usersRepository
.
Edit
(
&
newSuperUser
)
if
err
!=
nil
{
e
:=
fmt
.
Sprintf
(
"更新公司主管user数据(id=%d)"
,
newSuperUser
.
Id
)
e
:=
fmt
.
Sprintf
(
"更新公司主管user数据(id=%d)失败:%s"
,
newSuperUser
.
Id
,
err
)
return
lib
.
ThrowError
(
lib
.
BUSINESS_ERROR
,
e
)
}
err
=
transactionContext
.
CommitTransaction
()
...
...
pkg/application/unifiedUserCenter/service/service.go
查看文件 @
f987cfe
...
...
@@ -12,6 +12,7 @@ type SyncAction interface {
}
//actionMap 数据同步需要的动作集合,静态不要在运行时变更这里的数据
//position:职位,department:部门,employee:员工,company:公司
var
actionMap
=
map
[
string
]
SyncAction
{
// "department":
// "position":
...
...
pkg/infrastructure/dao/pg_admin_user_dao.go
查看文件 @
f987cfe
...
...
@@ -35,7 +35,7 @@ func (dao *AdminUserDao) UpdatePassword(id int64, pwd string) error {
return
err
}
//Update
Password
....
//Update
IsUsable
....
func
(
dao
*
AdminUserDao
)
UpdateIsUsable
(
id
int64
,
isUsable
bool
)
error
{
tx
:=
dao
.
transactionContext
.
PgDd
m
:=
&
models
.
AdminUser
{}
...
...
请
注册
或
登录
后发表评论