|
@@ -38,6 +38,7 @@ func (this *EtaBusinessMenuController) List() {
|
|
|
|
|
|
resp := new(eta_business.EtaBusinessMenuListResp)
|
|
|
resp.ChoiceList = make([]int, 0)
|
|
|
+ resp.HalfChoiceList = make([]int, 0)
|
|
|
resp.List = make([]*eta_business.EtaBusinessMenuItem, 0)
|
|
|
// 权限校验
|
|
|
ok, e := etaBusinessService.CheckEtaBusinessOperateAuth(sysUser.RoleTypeCode)
|
|
@@ -68,6 +69,10 @@ func (this *EtaBusinessMenuController) List() {
|
|
|
return
|
|
|
}
|
|
|
for _, r := range relates {
|
|
|
+ if r.Type == 1 {
|
|
|
+ resp.HalfChoiceList = append(resp.HalfChoiceList, r.MenuId)
|
|
|
+ continue
|
|
|
+ }
|
|
|
resp.ChoiceList = append(resp.ChoiceList, r.MenuId)
|
|
|
}
|
|
|
}
|
|
@@ -162,6 +167,10 @@ func (this *EtaBusinessMenuController) SaveRelate() {
|
|
|
br.Msg = "请选择菜单"
|
|
|
return
|
|
|
}
|
|
|
+ if len(req.HalfMenuIds) == 0 {
|
|
|
+ br.Msg = "请选择菜单"
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
ob := new(eta_business.EtaBusinessMenuRelate)
|
|
|
items := make([]*eta_business.EtaBusinessMenuRelate, 0)
|
|
@@ -171,6 +180,13 @@ func (this *EtaBusinessMenuController) SaveRelate() {
|
|
|
t.EtaBusinessId = req.EtaBusinessId
|
|
|
items = append(items, t)
|
|
|
}
|
|
|
+ for _, v := range req.HalfMenuIds {
|
|
|
+ t := new(eta_business.EtaBusinessMenuRelate)
|
|
|
+ t.MenuId = v
|
|
|
+ t.Type = 1
|
|
|
+ t.EtaBusinessId = req.EtaBusinessId
|
|
|
+ items = append(items, t)
|
|
|
+ }
|
|
|
if e := ob.CreateMulti(req.EtaBusinessId, items); e != nil {
|
|
|
br.Msg = "保存失败"
|
|
|
br.ErrMsg = "保存商家菜单关联失败, Err: " + e.Error()
|