英文分类编辑权限

controllers/classify.go

@@ -200,17 +200,20 @@ func (this *ClassifyController) Add() {
 		}
 	}
 	//获取报告分类权限列表
-	req2 := services.EditClassifyPermissionReq{
-		Keyword:               item.ClassifyName,
-		ChartPermissionIdList: req.ChartPermissionIdList,
-		NewKeyword:            item.ClassifyName,
-	}
-	err = services.EditClassifyChartPermission(req2)
-	if err != nil {
-		br.Msg = "修改分类权限失败"
-		br.ErrMsg = "修改分类权限失败，Err:" + err.Error()
-		return
+	if classify.ParentId > 0 { //二级分类才能修改权限
+		req2 := services.EditClassifyPermissionReq{
+			Keyword:               item.ClassifyName,
+			ChartPermissionIdList: req.ChartPermissionIdList,
+			NewKeyword:            item.ClassifyName,
+		}
+		err = services.EditClassifyChartPermission(req2)
+		if err != nil {
+			br.Msg = "修改分类权限失败"
+			br.ErrMsg = "修改分类权限失败，Err:" + err.Error()
+			return
+		}
 	}
+
 	// 新增关联了电话会的二级分类时, 同步FICC活动分类
 	//if req.ParentId > 0 && req.RelateTel == 1 {
 	//	go func() {
@@ -481,7 +484,7 @@ func (this *ClassifyController) Edit() {
 	item.ShowType = req.ShowType
 	item.HasTeleconference = req.HasTeleconference
 	item.VipTitle = req.VipTitle
-	item.Sort = req.Sort
+	//	item.Sort = req.Sort
 	item.IsShow = req.IsShow
 	item.YbFiccSort = req.YbFiccSort
 	item.YbFiccIcon = req.YbFiccIcon
@@ -513,21 +516,20 @@ func (this *ClassifyController) Edit() {
 		}
 	}
 
-	//获取报告分类权限列表
-	req2 := services.EditClassifyPermissionReq{
-		Keyword:               oldClassifyName,
-		ChartPermissionIdList: req.ChartPermissionIdList,
-		NewKeyword:            item.ClassifyName,
-	}
-	err = services.EditClassifyChartPermission(req2)
-	if err != nil {
-		br.Msg = "修改分类权限失败"
-		br.ErrMsg = "修改分类权限失败，Err:" + err.Error()
-		return
-	}
-
 	// 为二级分类时, 更新父级分类是否含电话会字段
 	if req.ParentId > 0 {
+		//二级分类才能修改权限
+		req2 := services.EditClassifyPermissionReq{
+			Keyword:               oldClassifyName,
+			ChartPermissionIdList: req.ChartPermissionIdList,
+			NewKeyword:            item.ClassifyName,
+		}
+		err = services.EditClassifyChartPermission(req2)
+		if err != nil {
+			br.Msg = "修改分类权限失败"
+			br.ErrMsg = "修改分类权限失败，Err:" + err.Error()
+			return
+		}
 		go func() {
 			_ = services.UpdateParentClassifyHasTel(req.ClassifyId, req.ParentId, req.HasTeleconference)
 		}()

controllers/english_report/english_classify.go

@@ -235,7 +235,7 @@ func (this *EnglishReportController) AddClassify() {
 		br.ErrMsg = "查询品种排序失败, Err: " + e.Error()
 		return
 	}
-	// 更新品种权限
+
 	nowTime := time.Now().Local()
 	item := &models.EnglishClassify{
 		ClassifyName: classifyName,
@@ -264,8 +264,8 @@ func (this *EnglishReportController) AddClassify() {
 		br.ErrMsg = "保存失败,Err:" + err.Error()
 		return
 	}
+	item.Id = int(newId)
 	if parentId == 0 { //一级目录的rootId等于自己本身
-		item.Id = int(newId)
 		item.RootId = int(newId)
 		err = item.UpdateEnglishClassify([]string{"RootId"})
 		if err != nil {
@@ -275,18 +275,20 @@ func (this *EnglishReportController) AddClassify() {
 		}
 	}
 
-	permissions := make([]*models.EnClassifyPermission, 0)
-	for _, p := range req.EnPermissions {
-		v := new(models.EnClassifyPermission)
-		v.EnPermissionId = p
-		v.EnClassifyId = item.Id
-		v.CreateTime = nowTime
-		permissions = append(permissions, v)
-	}
-	if e = models.CreateEnClassifyPermissions(permissions); e != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
-		return
+	if item.ParentId != item.RootId && item.ParentId > 0 { //三级分类才能绑定品种权限
+		permissions := make([]*models.EnClassifyPermission, 0)
+		for _, p := range req.EnPermissions {
+			v := new(models.EnClassifyPermission)
+			v.EnPermissionId = p
+			v.EnClassifyId = item.Id
+			v.CreateTime = nowTime
+			permissions = append(permissions, v)
+		}
+		if e = models.CreateEnClassifyPermissions(permissions); e != nil {
+			br.Msg = "保存失败"
+			br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
+			return
+		}
 	}
 
 	br.Ret = 200
@@ -294,6 +296,7 @@ func (this *EnglishReportController) AddClassify() {
 	br.Msg = "新增成功"
 }
 
+// EditClassify
 // @Title 编辑分类
 // @Description 编辑分类接口
 // @Param   ClassifyId   int  true       "分类Id"
@@ -301,7 +304,7 @@ func (this *EnglishReportController) AddClassify() {
 // @Param   ParentId   query   int  true       "父级Id 添加父级时为0"
 // @Param   Sort   query   string  false       "排序"
 // @Success 200 保存成功
-// @router /classify/edit [get]
+// @router /classify/edit [post]
 func (this *EnglishReportController) EditClassify() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -319,7 +322,7 @@ func (this *EnglishReportController) EditClassify() {
 	classifyId := req.ClassifyId
 	classifyName := req.ClassifyName
 	parentId := req.ParentId
-	ob := new(models.EnglishClassify)
+	//ob := new(models.EnglishClassify)
 
 	if parentId == classifyId {
 		br.Msg = "上级分类不能选择自己"
@@ -397,23 +400,23 @@ func (this *EnglishReportController) EditClassify() {
 		rootId = oldItem.Id
 	}
 
-	maxSort, e := ob.GetMaxSortByParentId(parentId)
+	/*maxSort, e := ob.GetMaxSortByParentId(parentId)
 	if e != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = "查询品种排序失败, Err: " + e.Error()
 		return
-	}
-	// 更新品种权限
+	}*/
+
 	nowTime := time.Now().Local()
 
 	item := &models.EnglishClassify{
 		Id:           oldItem.Id,
 		ClassifyName: classifyName,
-		Sort:         maxSort + 1,
-		ParentId:     parentId,
-		RootId:       rootId,
-		ModifyTime:   nowTime,
-		IsShow:       1,
+		//	Sort:         maxSort + 1,
+		ParentId:   parentId,
+		RootId:     rootId,
+		ModifyTime: nowTime,
+		IsShow:     1,
 	}
 	{
 		// 更新研报里的分类名称
@@ -437,18 +440,20 @@ func (this *EnglishReportController) EditClassify() {
 		return
 	}
 	// 更新权限
-	permissions := make([]*models.EnClassifyPermission, 0)
-	for _, p := range req.EnPermissions {
-		v := new(models.EnClassifyPermission)
-		v.EnPermissionId = p
-		v.EnClassifyId = req.ClassifyId
-		v.CreateTime = nowTime
-		permissions = append(permissions, v)
-	}
-	if e = models.ClearAndCreateEnClassifyPermissions(req.ClassifyId, permissions); e != nil {
-		br.Msg = "保存失败"
-		br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
-		return
+	if item.ParentId != item.RootId && item.ParentId > 0 { //三级分类才能编辑品种
+		permissions := make([]*models.EnClassifyPermission, 0)
+		for _, p := range req.EnPermissions {
+			v := new(models.EnClassifyPermission)
+			v.EnPermissionId = p
+			v.EnClassifyId = req.ClassifyId
+			v.CreateTime = nowTime
+			permissions = append(permissions, v)
+		}
+		if e = models.ClearAndCreateEnClassifyPermissions(req.ClassifyId, permissions); e != nil {
+			br.Msg = "保存失败"
+			br.ErrMsg = "更新分类品种权限失败, Err: " + e.Error()
+			return
+		}
 	}
 
 	err = models.UpdateEnglishReportClassifyByFirstSecondClassifyId(classifyId, parentId)

routers/commentsRouter.go

@@ -4916,7 +4916,7 @@ func init() {
         beego.ControllerComments{
             Method: "AddClassify",
             Router: `/classify/add`,
-            AllowHTTPMethods: []string{"get"},
+            AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})
@@ -4934,7 +4934,7 @@ func init() {
         beego.ControllerComments{
             Method: "EditClassify",
             Router: `/classify/edit`,
-            AllowHTTPMethods: []string{"get"},
+            AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})