caipin 4 年 前
コミット
b23a9570e9
2 ファイル変更7 行追加3 行削除
  1. 5 1
      services/project_service.go
  2. 2 2
      web/viewmodels/project.go

+ 5 - 1
services/project_service.go

@@ -208,7 +208,7 @@ func (s *projectService) SaveBs(projectVM viewmodels.Project, id int) error {
 	project := &models.CmProject{}
 	project.Id = id
 	project.Name = projectVM.Name
-	project.InsideCategoryid = projectVM.InsideCategoryId
+	project.InsideCategoryid = projectVM.InsideCategoryid
 	project.InsideCategory = projectVM.InsideCategory
 
 	project.CategoryId = projectVM.CategoryId
@@ -234,7 +234,9 @@ func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM.Id = id
 	projectVM.Code = projectCM.Code
 	projectVM.Name = projectCM.Name
+	projectVM.CategoryId = projectCM.CategoryId
 	projectVM.Category = projectCM.Category
+	projectVM.StaffId = projectCM.StaffId
 	projectVM.StaffName = projectCM.StaffName
 	projectVM.StaffPhone = projectCM.StaffPhone
 	projectVM.StaffQq = projectCM.StaffQq
@@ -242,6 +244,8 @@ func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM.UserId = userId
 	projectVM.UserAccount = projectCM.UserAccount
 	projectVM.Status = projectCM.Status
+	projectVM.InsideCategory = projectCM.InsideCategory
+	projectVM.InsideCategoryid = projectCM.InsideCategoryid
 
 	if !projectCM.CreateTime.IsZero() {
 		projectVM.CreateTime = projectCM.CreateTime.Format(conf.SysTimeform)

+ 2 - 2
web/viewmodels/project.go

@@ -30,7 +30,7 @@ type Project struct {
 	CreateTime       string `form:"createTime" json:"createTime"`
 	CreateName       string `form:"createName" json:"createName"`
 	CreateCategory   string `form:"createCategory" json:"createCategory"`
-	InsideCategoryId string `form:"insideCategoryId" json:"insideCategoryId"`
+	InsideCategoryid string `form:"insideCategoryId" json:"insideCategoryId"`
 	InsideCategory   string `form:"insideCategory" json:"insideCategory"`
 	Remark           string `form:"remark" json:"remark"`
 }
@@ -81,7 +81,7 @@ func (l Project) ValidateSave() error {
 		validation.Field(&l.Id, validation.Required.Error("项目ID不能为空")),
 		validation.Field(&l.Name, validation.Required.Error("项目名称不能为空")),
 
-		validation.Field(&l.InsideCategoryId, validation.Required.Error("所在办事处ID不能为空")),
+		validation.Field(&l.InsideCategoryid, validation.Required.Error("所在办事处ID不能为空")),
 		validation.Field(&l.InsideCategory, validation.Required.Error("所在办事处不能为空")),
 
 		validation.Field(&l.Category, validation.Required.Error("负责人办事处不能为空")),