allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 f6701f438de465eed953ba7958ee1d44c3bf1b28 1 个父辈 5a0fdf78

用户菜单修改

内嵌 并排对比
正在显示 5 个修改的文件 包含 16 行增加 和 4 行删除
@@ -10,6 +10,10 @@ import ( @@ -10,6 +10,10 @@ import (
10 type UserMenusCommand struct { 10 type UserMenusCommand struct {
11 //操作人 11 //操作人
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
  13 + // 菜单类别 web app
  14 + MenuCategory string `cname:"菜单类别 web app" json:"menuCategory,omitempty"`
  15 + // 返回所有不可以用的菜单
  16 + ALLDisableMenu int `cname:"同时返回所有不可以用的菜单 1:包含不可用的菜单 0:过滤不可用的菜单 " json:"allDisableMenu"`
13 } 17 }
14 18
15 func (userMenusCommand *UserMenusCommand) Valid(validation *validation.Validation) { 19 func (userMenusCommand *UserMenusCommand) Valid(validation *validation.Validation) {
@@ -234,7 +234,9 @@ func (svr AuthService) GetUserMenus(userMenusCommand *command.UserMenusCommand) @@ -234,7 +234,9 @@ func (svr AuthService) GetUserMenus(userMenusCommand *command.UserMenusCommand)
234 creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( 234 creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
235 userMenusCommand.Operator) 235 userMenusCommand.Operator)
236 resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{ 236 resultMenu, err := creationUserGateway.UserAccessMenus(allied_creation_user.ReqUserAccessMenus{
237 - UserId: int(userMenusCommand.Operator.UserId), 237 + UserId: int(userMenusCommand.Operator.UserId),
  238 + MenuCategory: userMenusCommand.MenuCategory,
  239 + ALLDisableMenu: userMenusCommand.ALLDisableMenu,
238 }) 240 })
239 if err != nil { 241 if err != nil {
240 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 242 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -25,8 +25,9 @@ type CooperationApplicationItem struct { @@ -25,8 +25,9 @@ type CooperationApplicationItem struct {
25 IsCanceled bool `json:"isCanceled"` //是否取消 25 IsCanceled bool `json:"isCanceled"` //是否取消
26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述 26 CooperationApplicationVerifyDescription string `json:"cooperationApplicationVerifyDescription"` //审核描述
27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间 27 CooperationApplicationVerifyTime time.Time `json:"cooperationApplicationVerifyTime"` //审核时间
28 - CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //申请状态  
29 - Org struct { 28 + CooperationApplicationStatus int `json:"cooperationApplicationStatus"` //
  29 +
  30 + Org struct {
30 OrgID int `json:"orgId"` 31 OrgID int `json:"orgId"`
31 OrgName string `json:"orgName"` 32 OrgName string `json:"orgName"`
32 } `json:"org"` //组织 33 } `json:"org"` //组织
@@ -310,6 +310,10 @@ type ( @@ -310,6 +310,10 @@ type (
310 type ( 310 type (
311 ReqUserAccessMenus struct { 311 ReqUserAccessMenus struct {
312 UserId int `json:"userId"` 312 UserId int `json:"userId"`
  313 + // 菜单类别 web app
  314 + MenuCategory string `cname:"菜单类别 web app" json:"menuCategory,omitempty"`
  315 + // 返回所有不可以用的菜单
  316 + ALLDisableMenu int `cname:"同时返回所有不可以用的菜单 1:包含不可用的菜单 0:过滤不可用的菜单 " json:"allDisableMenu"`
313 } 317 }
314 DataUserAccessMenus struct { 318 DataUserAccessMenus struct {
315 Menus []struct { 319 Menus []struct {
@@ -32,7 +32,8 @@ func init() { @@ -32,7 +32,8 @@ func init() {
32 web.Router("/v1/app/cooperation-projects/:projectId", &mobile_client.CooperationController{}, "Put:UpdateCooperationProject") 32 web.Router("/v1/app/cooperation-projects/:projectId", &mobile_client.CooperationController{}, "Put:UpdateCooperationProject")
33 web.Router("/v1/app/cooperation-projects/end", &mobile_client.CooperationController{}, "Post:EndCooperationProject") 33 web.Router("/v1/app/cooperation-projects/end", &mobile_client.CooperationController{}, "Post:EndCooperationProject")
34 web.Router("/v1/app/cooperation-projects/search", &mobile_client.CooperationController{}, "Post:SearchCooperationProject") 34 web.Router("/v1/app/cooperation-projects/search", &mobile_client.CooperationController{}, "Post:SearchCooperationProject")
35 - web.Router("/v1/app/cooperation-modes/", &web_client.CooperationModeController{}, "Get:ListCooperationMode") 35 + web.Router("/v1/app/cooperation-modes", &web_client.CooperationModeController{}, "Get:ListCooperationMode")
  36 + web.Router("/v1/common/cooperation/mode", &web_client.CooperationModeController{}, "Get:ListCooperationMode")
36 37
37 web.Router("/v1/app/cooperation-projects/person/search", &mobile_client.CooperationController{}, "Post:PersonSearchCooperationProject") 38 web.Router("/v1/app/cooperation-projects/person/search", &mobile_client.CooperationController{}, "Post:PersonSearchCooperationProject")
38 39