caipin 4 tahun lalu
induk
melakukan
56a2e4027b
2 mengubah file dengan 16 tambahan dan 14 penghapusan
  1. 2 1
      services/project_service.go
  2. 14 13
      web/viewmodels/project.go

+ 2 - 1
services/project_service.go

@@ -264,7 +264,8 @@ func makeProjectVM(projectCM *models.CmProject) viewmodels.Project {
 	projectVM.Name = projectCM.Name
 	projectVM.CategoryId = projectCM.CategoryId
 	projectVM.Category = projectCM.Category
-	projectVM.StaffId = staffId
+	projectVM.StaffIdEncrypted = staffId
+	projectVM.StaffId = projectCM.StaffId
 	projectVM.StaffName = projectCM.StaffName
 	projectVM.StaffPhone = projectCM.StaffPhone
 	projectVM.StaffQq = projectCM.StaffQq

+ 14 - 13
web/viewmodels/project.go

@@ -13,19 +13,20 @@ import (
 )
 
 type Project struct {
-	Id             string `form:"id" json:"id"`
-	Code           string `form:"code" json:"code"`
-	Name           string `form:"name" json:"name"`
-	UserId         string `form:"userId" json:"userId"`
-	UserAccount    string `form:"userAccount" json:"userAccount"`
-	CategoryId     string `form:"categoryId" json:"categoryId"`
-	Category       string `form:"category" json:"category"`
-	StaffId        string `form:"staffId" json:"staffId"`
-	StaffName      string `form:"staffName" json:"staffName"`
-	StaffQq        string `form:"staffQq" json:"staffQq"`
-	StaffPhone     string `form:"staffPhone" json:"staffPhone"`
-	StaffTelephone string `form:"staffTelephone" json:"staffTelephone"`
-	Status         int    `form:"status" json:"status"`
+	Id               string `form:"id" json:"id"`
+	Code             string `form:"code" json:"code"`
+	Name             string `form:"name" json:"name"`
+	UserId           string `form:"userId" json:"userId"`
+	UserAccount      string `form:"userAccount" json:"userAccount"`
+	CategoryId       string `form:"categoryId" json:"categoryId"`
+	Category         string `form:"category" json:"category"`
+	StaffIdEncrypted string `form:"staffIdEncrypted" json:"staffIdEncrypted"`
+	StaffId          string `form:"staffId" json:"staffId"`
+	StaffName        string `form:"staffName" json:"staffName"`
+	StaffQq          string `form:"staffQq" json:"staffQq"`
+	StaffPhone       string `form:"staffPhone" json:"staffPhone"`
+	StaffTelephone   string `form:"staffTelephone" json:"staffTelephone"`
+	Status           int    `form:"status" json:"status"`
 
 	CreateTime       string `form:"createTime" json:"createTime"`
 	CreateName       string `form:"createName" json:"createName"`