模式修改

@@ -318,6 +318,7 @@ func (svr AuthService) GetUserMenus(userMenusCommand *command.UserMenusCommand)
 		UserId:         int(userMenusCommand.Operator.UserId),
 		UserId:         int(userMenusCommand.Operator.UserId),
 		MenuCategory:   userMenusCommand.MenuCategory,
 		MenuCategory:   userMenusCommand.MenuCategory,
 		ALLDisableMenu: userMenusCommand.ALLDisableMenu,
 		ALLDisableMenu: userMenusCommand.ALLDisableMenu,
+		OrgId:          userMenusCommand.Operator.OrgId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())

@@ -155,6 +155,7 @@ func (cooperationModeService *CooperationModeService) CooperationModeSelector(li
 		OrgIds:              nil,
 		OrgIds:              nil,
 		OrgId:               listCooperationModeQuery.Operator.OrgId,
 		OrgId:               listCooperationModeQuery.Operator.OrgId,
 		UserBaseId:          0,
 		UserBaseId:          0,
+		Status:              1,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -166,6 +166,8 @@ type (
 		UserId           int64   `json:"userId"`
 		UserId           int64   `json:"userId"`
 		UserBaseId       int64   `json:"userBaseId"`
 		UserBaseId       int64   `json:"userBaseId"`
 		OrgIds           []int64 `json:"orgIds"`
 		OrgIds           []int64 `json:"orgIds"`
+		// 共创模式状态，1启用，2禁用
+		Status int32 `json:"status"`
 		//模式编码列表
 		//模式编码列表
 		CooperationModeNumbers []string `cname:"模式编码列表" json:"cooperationModeNumbers,omitempty"`
 		CooperationModeNumbers []string `cname:"模式编码列表" json:"cooperationModeNumbers,omitempty"`
 	}
 	}

@@ -317,6 +317,8 @@ type (
 type (
 type (
 	ReqUserAccessMenus struct {
 	ReqUserAccessMenus struct {
 		UserId int `json:"userId"`
 		UserId int `json:"userId"`
+		// 当前登录组织orgId
+		OrgId int64 `cname:"当前登录组织Id" json:"orgId"`
 		// 菜单类别 web app
 		// 菜单类别 web app
 		MenuCategory string `cname:"菜单类别 web app" json:"menuCategory,omitempty"`
 		MenuCategory string `cname:"菜单类别 web app" json:"menuCategory,omitempty"`
 		// 返回所有不可以用的菜单
 		// 返回所有不可以用的菜单