正在显示
3 个修改的文件
包含
8 行增加
和
1 行删除
@@ -295,6 +295,11 @@ func (svr AuthService) GetFavoriteMenus(userInfoCommand *command.UserInfoCommand | @@ -295,6 +295,11 @@ func (svr AuthService) GetFavoriteMenus(userInfoCommand *command.UserInfoCommand | ||
295 | 295 | ||
296 | //GetUserMenus 获取用户菜单 | 296 | //GetUserMenus 获取用户菜单 |
297 | func (svr AuthService) GetUserMenus(userMenusCommand *command.UserMenusCommand) (interface{}, error) { | 297 | func (svr AuthService) GetUserMenus(userMenusCommand *command.UserMenusCommand) (interface{}, error) { |
298 | + if userMenusCommand.Operator.UserId == 0 { | ||
299 | + return map[string]interface{}{ | ||
300 | + "accessMenus": struct{}{}, | ||
301 | + }, nil | ||
302 | + } | ||
298 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( | 303 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( |
299 | userMenusCommand.Operator) | 304 | userMenusCommand.Operator) |
300 | resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{ | 305 | resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{ |
@@ -86,7 +86,7 @@ func (orgsService *OrgsService) OrgList(orgListQuery *query.OrgListQuery) (inter | @@ -86,7 +86,7 @@ func (orgsService *OrgsService) OrgList(orgListQuery *query.OrgListQuery) (inter | ||
86 | CompanyId: int(orgListQuery.Operator.CompanyId), | 86 | CompanyId: int(orgListQuery.Operator.CompanyId), |
87 | DepName: orgListQuery.DepName, | 87 | DepName: orgListQuery.DepName, |
88 | IsOrg: 0, | 88 | IsOrg: 0, |
89 | - Limit: 0, | 89 | + Limit: 1000, |
90 | Offset: 0, | 90 | Offset: 0, |
91 | OrgCode: orgListQuery.OrgCode, | 91 | OrgCode: orgListQuery.OrgCode, |
92 | ParentId: parentOrgId, | 92 | ParentId: parentOrgId, |
@@ -162,6 +162,7 @@ func (orgsService OrgsService) DepartmentsUsers(departmentsUsersQuery *query.Dep | @@ -162,6 +162,7 @@ func (orgsService OrgsService) DepartmentsUsers(departmentsUsersQuery *query.Dep | ||
162 | users, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{ | 162 | users, err := creationUserGateway.UserSearch(allied_creation_user.ReqUserSearch{ |
163 | CompanyId: departmentsUsersQuery.Operator.CompanyId, | 163 | CompanyId: departmentsUsersQuery.Operator.CompanyId, |
164 | OrganizationId: departmentsUsersQuery.Operator.OrgId, | 164 | OrganizationId: departmentsUsersQuery.Operator.OrgId, |
165 | + Limit: 100, | ||
165 | }) | 166 | }) |
166 | if err != nil { | 167 | if err != nil { |
167 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 168 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
@@ -112,6 +112,7 @@ func CheckAccessToken2() web.FilterFunc { | @@ -112,6 +112,7 @@ func CheckAccessToken2() web.FilterFunc { | ||
112 | "/v1/auth/refresh-token": "", | 112 | "/v1/auth/refresh-token": "", |
113 | "/v1/app/cooperation-projects/person/search": "", | 113 | "/v1/app/cooperation-projects/person/search": "", |
114 | "/v1/common/dictionary/search": "", | 114 | "/v1/common/dictionary/search": "", |
115 | + "/v1/common/app-sharing": "", | ||
115 | } | 116 | } |
116 | var err error | 117 | var err error |
117 | if filterUrl, err := url.Parse(ctx.Request.RequestURI); err == nil { | 118 | if filterUrl, err := url.Parse(ctx.Request.RequestURI); err == nil { |
-
请 注册 或 登录 后发表评论