Przeglądaj źródła

岗位修改bug修复

yxh 5 lat temu
rodzic
commit
b8fd326ed3
2 zmienionych plików z 20 dodań i 15 usunięć
  1. 4 3
      app/controller/admin/post.go
  2. 16 12
      app/model/admin/sys_post/sys_post.go

+ 4 - 3
app/controller/admin/post.go

@@ -3,6 +3,7 @@ package admin
 import (
 	"gfast/app/model/admin/sys_post"
 	"gfast/app/service/admin/post_service"
+	"gfast/app/service/admin/user_service"
 	"gfast/library/response"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/net/ghttp"
@@ -15,7 +16,7 @@ type Post struct{}
 // @Description 分页列表
 // @Tags 岗位
 // @Param data body sys_post.SearchParams true "data"
-// @Success 0 {object} response.Response "{"code": 200, "data": [...]}"
+// @Success 0 {object} response.Response "{"code": 0, "data": [...]}"
 // @Router /system/post/list [post]
 // @Security
 func (c *Post) List(r *ghttp.Request) {
@@ -57,7 +58,7 @@ func (c *Post) Add(r *ghttp.Request) {
 		if err := r.Parse(&addParams); err != nil {
 			response.FailJson(true, r, err.(*gvalid.Error).FirstString())
 		}
-
+		addParams.AddUser = user_service.GetLoginID(r)
 		if _, err := post_service.Add(addParams); err != nil {
 			response.FailJson(true, r, err.Error())
 		}
@@ -82,7 +83,7 @@ func (c *Post) Edit(r *ghttp.Request) {
 		if err := r.Parse(&editParams); err != nil {
 			response.FailJson(true, r, err.(*gvalid.Error).FirstString())
 		}
-
+		editParams.UpUser = user_service.GetLoginID(r)
 		if _, err := post_service.Edit(editParams); err != nil {
 			response.FailJson(true, r, err.Error())
 		}

+ 16 - 12
app/model/admin/sys_post/sys_post.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gogf/gf/errors/gerror"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/os/gtime"
+	"github.com/gogf/gf/util/gconv"
 )
 
 // Fill with you ideas below.
@@ -38,11 +39,13 @@ type AddParams struct {
 	PostSort int    `p:"postSort" v:"required#岗位排序不能为空"`
 	Status   string `p:"status" v:"required#状态不能为空"`
 	Remark   string `p:"remark"`
+	AddUser  int
 }
 
 type EditParams struct {
 	PostId int64 `p:"postId" v:"required#id必须"`
 	AddParams
+	UpUser int
 }
 
 func List(req *SearchParams) (total, page int, list gdb.Result, err error) {
@@ -105,14 +108,13 @@ func GetUsedPost() (list []*Entity, err error) {
 添加
 */
 func Add(addParams *AddParams) (result sql.Result, err error) {
-	//g.Log().Println(addParams)
 	entity := &Entity{
 		PostCode:   addParams.PostCode,
 		PostName:   addParams.PostName,
 		PostSort:   addParams.PostSort,
 		Status:     addParams.Status,
 		Remark:     addParams.Remark,
-		CreateBy:   "",
+		CreateBy:   gconv.String(addParams.AddUser),
 		CreateTime: gtime.Now(),
 	}
 
@@ -121,17 +123,19 @@ func Add(addParams *AddParams) (result sql.Result, err error) {
 }
 
 func Edit(editParams *EditParams) (result sql.Result, err error) {
-	entity := &Entity{
-		PostId:     editParams.PostId,
-		PostCode:   editParams.PostCode,
-		PostName:   editParams.PostName,
-		PostSort:   editParams.PostSort,
-		Status:     editParams.Status,
-		Remark:     editParams.Remark,
-		UpdateBy:   "",
-		UpdateTime: gtime.Now(),
+	var entity *Entity
+	entity, err = Model.FindOne(editParams.PostId)
+	entity.PostId = editParams.PostId
+	entity.PostCode = editParams.PostCode
+	entity.PostName = editParams.PostName
+	entity.PostSort = editParams.PostSort
+	entity.Status = editParams.Status
+	entity.Remark = editParams.Remark
+	entity.UpdateBy = gconv.String(editParams.UpUser)
+	entity.UpdateTime = gtime.Now()
+	if entity.CreateTime == nil {
+		entity.CreateTime = entity.UpdateTime
 	}
-
 	return entity.Update()
 }