caipin пре 4 година
родитељ
комит
52aff798c5
2 измењених фајлова са 7 додато и 9 уклоњено
  1. 5 6
      services/project_service.go
  2. 2 3
      web/backstage/project_bs.go

+ 5 - 6
services/project_service.go

@@ -34,7 +34,7 @@ type ProjectService interface {
 	GetName(code string) []viewmodels.Project
 	Save(projectId int, projectVM viewmodels.Project) error
 	Add(projectVM viewmodels.Project) error
-	SaveBs(projectVM viewmodels.Project, id int, manager *models.CmManager) error
+	SaveBs(projectVM viewmodels.Project, id int, staffName string) error
 	GetListBs(pageData viewmodels.ProjectPage, staffName string) (data []viewmodels.Project, total int64)
 }
 
@@ -221,15 +221,14 @@ func (s *projectService) Add(projectVM viewmodels.Project) error {
 }
 
 // 更新项目-后台
-func (s *projectService) SaveBs(projectVM viewmodels.Project, id int, manager *models.CmManager) error {
+func (s *projectService) SaveBs(projectVM viewmodels.Project, id int, staffName string) error {
 
 	// 1.获得项目信息
 	projectData, _ := s.dao.FindById(id)
 	// 管理员和自己可以更新
-	if manager.IsAdmin != 1 {
-		if manager.Username != projectData.StaffName {
-			return errors.New("无权编辑")
-		}
+
+	if staffName != projectData.StaffName {
+		return errors.New("无权编辑")
 	}
 
 	project := &models.CmProject{}

+ 2 - 3
web/backstage/project_bs.go

@@ -11,7 +11,6 @@ import (
 	"log"
 
 	"github.com/kataras/iris/v12"
-	"go.mod/models"
 	"go.mod/services"
 	"go.mod/web/utils"
 	"go.mod/web/viewmodels"
@@ -229,10 +228,10 @@ func (c *ProjectBs) PostSave() {
 	}
 
 	// 获得登陆的管理员
-	manager := c.Ctx.Values().Get("manager").(*models.CmManager)
+	staffName, err := utils.GetBackstageKey(c.Ctx, "StaffName")
 
 	// 新增项目信息
-	err = c.ServiceProject.SaveBs(projectData, id, manager)
+	err = c.ServiceProject.SaveBs(projectData, id, staffName)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return