切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxuhui
4 years ago
提交
1711ba5011d0c3101d48364d93e10355a5c4fe6d
1 个父辈
da81d979
添加下拉列表接口
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
25 行增加
和
11 行删除
pkg/application/web/users/service/users.go
pkg/port/beego/controllers/web_client/users_controller.go
pkg/port/beego/routers/web_users_router.go
pkg/application/web/users/service/users.go
查看文件 @
1711ba5
...
...
@@ -424,22 +424,25 @@ func (usersService *UsersService) SelectorCompanyRole(selectorQuery *query.Compa
selectorQuery
.
Operator
.
OrgId
,
selectorQuery
.
Operator
.
UserId
)
result
,
err
:=
creationUserGateway
.
RoleSearch
(
allied_creation_user
.
ReqRoleSearch
{
Limit
:
selectorQuery
.
PageSize
,
Offset
:
(
selectorQuery
.
PageNumber
-
1
)
*
selectorQuery
.
PageSize
,
Limit
:
selectorQuery
.
PageSize
,
Offset
:
(
selectorQuery
.
PageNumber
-
1
)
*
selectorQuery
.
PageSize
,
RoleName
:
selectorQuery
.
RoleName
,
})
if
err
!=
nil
{
return
0
,
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
}
var
(
dataList
[]
dto
.
UserOrg
// item dto.UserOrg
dataList
[]
dto
.
UserRole
item
dto
.
UserRole
)
// for _, v := range result.Orgs {
// item = dto.UserOrg{
// OrgID: strconv.Itoa(v.OrgID),
// OrgName: v.OrgName,
// }
// dataList = append(dataList, item)
// }
for
_
,
v
:=
range
result
.
Roles
{
item
=
dto
.
UserRole
{
RoleID
:
strconv
.
Itoa
(
v
.
RoleID
),
RoleName
:
v
.
RoleName
,
OrgName
:
v
.
Ext
.
OrgName
,
Descript
:
v
.
Desc
,
}
dataList
=
append
(
dataList
,
item
)
}
return
int64
(
result
.
Count
),
dataList
,
nil
}
...
...
pkg/port/beego/controllers/web_client/users_controller.go
查看文件 @
1711ba5
...
...
@@ -129,3 +129,13 @@ func (controller *UsersController) SelectorCompanyOrg() {
cnt
,
data
,
err
:=
usersService
.
SelectorCompanyOrg
(
selectorQuery
)
controller
.
returnPageListData
(
cnt
,
data
,
err
,
selectorQuery
.
PageNumber
)
}
//SelectorCompanyRole 角色选择表
func
(
controller
*
UsersController
)
SelectorCompanyRole
()
{
usersService
:=
service
.
NewUsersService
(
nil
)
selectorQuery
:=
&
query
.
CompanyRoleSelectorQuery
{}
controller
.
Unmarshal
(
selectorQuery
)
selectorQuery
.
Operator
=
controller
.
GetOperator
()
cnt
,
data
,
err
:=
usersService
.
SelectorCompanyRole
(
selectorQuery
)
controller
.
returnPageListData
(
cnt
,
data
,
err
,
selectorQuery
.
PageNumber
)
}
...
...
pkg/port/beego/routers/web_users_router.go
查看文件 @
1711ba5
...
...
@@ -19,5 +19,6 @@ func init() {
web
.
Router
(
"/v1/web/users/cooperation-user/enable"
,
&
web_client
.
UsersController
{},
"Put:CooperationUserEnable"
)
web
.
Router
(
"/v1/web/users/cooperation-user/reset-password"
,
&
web_client
.
UsersController
{},
"Put:CooperationUserResetPassword"
)
web
.
Router
(
"/v1/web/users/selector/org"
,
&
web_client
.
UsersController
{},
"Post:SelectorCompanyOrg"
)
web
.
Router
(
"/v1/web/users/selector/role"
,
&
web_client
.
UsersController
{},
"Post:SelectorCompanyRole"
)
}
...
...
请
注册
或
登录
后发表评论