切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
yangfu
3 years ago
提交
8dcc00697420828378a1b9201390a0e4a1981489
1 个父辈
f4cde03f
增加共创组织查询
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
34 行增加
和
2 行删除
pkg/application/auth/service/service.go
pkg/application/mobile/user/service/service.go
pkg/port/beego/controllers/mobile_client/user_controller.go
pkg/port/beego/middleware/jwt.go
pkg/port/beego/routers/user_router.go
pkg/application/auth/service/service.go
查看文件 @
8dcc006
...
...
@@ -657,10 +657,9 @@ loopUser1:
//GetCompanyOrgsByUser 获取登录用户的公司组织列表
func
(
svr
AuthService
)
GetCompanyOrgsByUser
(
queryParam
*
query
.
GetCompanyOrgsByUserQuery
)
(
interface
{},
error
)
{
creationUserGateway
:=
allied_creation_user
.
NewHttplibAlliedCreationUser
(
queryParam
.
Operator
)
result
,
err
:=
creationUserGateway
.
UserSearch
(
allied_creation_user
.
ReqUserSearch
{
UserBaseId
:
queryParam
.
Operator
.
UserBaseId
,
Phone
:
queryParam
.
Operator
.
Phone
,
UserType
:
domain
.
UserTypeEmployee
,
PullRealTime
:
true
,
})
...
...
pkg/application/mobile/user/service/service.go
查看文件 @
8dcc006
...
...
@@ -247,3 +247,26 @@ func (srv UserService) UpdateMenuFavorite(menuFavoriteCommand *command.MenuFavor
}
return
result
,
nil
}
// 共创组织列表
func
(
srv
UserService
)
CooperationOrg
(
operator
domain
.
Operator
)
(
interface
{},
error
)
{
creationUserGateway
:=
allied_creation_user
.
NewHttplibAlliedCreationUser
(
operator
)
orgs
,
err
:=
creationUserGateway
.
OrgSearch
(
allied_creation_user
.
ReqOrgSearch
{
IsOrg
:
domain
.
IsOrgFlag
,
Limit
:
50
,
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
var
ret
=
make
([]
interface
{},
0
)
for
i
:=
range
orgs
.
Orgs
{
item
:=
orgs
.
Orgs
[
i
]
ret
=
append
(
ret
,
map
[
string
]
interface
{}{
"orgId"
:
item
.
OrgID
,
"orgName"
:
item
.
OrgName
,
})
}
return
map
[
string
]
interface
{}{
"orgs"
:
ret
,
},
nil
}
...
...
pkg/port/beego/controllers/mobile_client/user_controller.go
查看文件 @
8dcc006
...
...
@@ -138,3 +138,10 @@ func (controller *UserController) UpdateMenuFavorite() {
data
,
err
:=
svr
.
UpdateMenuFavorite
(
cmd
)
controller
.
Response
(
data
,
err
)
}
func
(
controller
*
UserController
)
CooperationOrg
()
{
svr
:=
service
.
UserService
{}
operator
:=
controller
.
GetOperator
()
data
,
err
:=
svr
.
CooperationOrg
(
operator
)
controller
.
Response
(
data
,
err
)
}
...
...
pkg/port/beego/middleware/jwt.go
查看文件 @
8dcc006
...
...
@@ -113,6 +113,7 @@ func CheckAccessToken2() web.FilterFunc {
"/v1/app/cooperation-projects/person/search"
:
""
,
"/v1/common/dictionary/search"
:
""
,
"/v1/common/app-sharing"
:
""
,
"/v1/user/cooperation-org"
:
""
,
}
var
err
error
if
filterUrl
,
err
:=
url
.
Parse
(
ctx
.
Request
.
RequestURI
);
err
==
nil
{
...
...
pkg/port/beego/routers/user_router.go
查看文件 @
8dcc006
...
...
@@ -24,6 +24,8 @@ func init() {
web
.
Router
(
"/v1/user/msgs"
,
&
mobile_client
.
UserController
{},
"Post:Messages"
)
web
.
Router
(
"/v1/user/msgs/mark-read"
,
&
mobile_client
.
UserController
{},
"Post:MessagesMarkRead"
)
web
.
Router
(
"/v1/user/cooperation-org"
,
&
mobile_client
.
UserController
{},
"Post:CooperationOrg"
)
// 特殊处理
web
.
Router
(
"/v1/app/orgs/department-users"
,
&
mobile_client
.
UserController
{},
"Post:DepartmentUsers"
)
web
.
Router
(
"/v1/web/orgs/department-users"
,
&
web_client
.
OrgController
{},
"Post:DepartmentUsers"
)
...
...
请
注册
或
登录
后发表评论