Browse Source

维护操作用户

liuyang 5 years ago
parent
commit
b2bb9d166e

+ 12 - 3
backend/src/dashoo.cn/modi_webapi/app/api/course/detail/detail.go

@@ -71,14 +71,19 @@ func (c CourseDetailController) Save(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	}
+	// 获取操作人
+	realName := r.GetParamVar("realname").String()
+
 	// 判断是新增还是删除,获取的id为空新增,不为空则更新
 	if entity.Id > 0 {
+		entity.UpdatedBy = realName
 		if detail, err := service.Update(entity); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
 			response.Json(r, 0, "更新成功", detail)
 		}
 	} else {
+		entity.CreatedBy = realName
 		if newId, err := service.Add(entity); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
@@ -112,14 +117,18 @@ func (c CourseDetailController) DeleteDetailById(r *ghttp.Request) {
 	tenant := r.Header.Get("Tenant")
 	// 详情id
 	Ids := r.GetInts("ids")
-	delReq := new(detail.DeleteReq)
-	delReq.Ids = Ids
+	delIdsReq := new(detail.DeleteIdsReq)
+	delUpdReq := new(detail.DeleteUpdReq)
+	delIdsReq.Id = Ids
+	// 获取操作人
+	realName := r.GetParamVar("realname").String()
+	delUpdReq.UpdatedBy = realName
 	// 初始化课程详情service
 	service, err := detailService.NewCourseDetailService(tenant)
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	}
-	if err := service.DeleteById(delReq); err != nil {
+	if err := service.DeleteById(delIdsReq, delUpdReq); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
 		response.Json(r, 0, "删除成功")

+ 5 - 2
backend/src/dashoo.cn/modi_webapi/app/model/course/detail/detail.go

@@ -42,9 +42,12 @@ type SearchEntity struct {
 }
 
 // 删除详情请求
-type DeleteReq struct {
-	Ids         []int       // 批量删除,id以逗号隔开
+type DeleteUpdReq struct {
 	IsDel       int         `orm:"isDel"`       // 是否删除 0未删除 1已删除
 	UpdatedBy   string      `orm:"UpdatedBy"`   // 更新人
 	UpdatedTime *gtime.Time `orm:"UpdatedTime"` // 更新时间
 }
+
+type DeleteIdsReq struct {
+	Id []int // 批量删除,id以逗号隔开
+}

+ 4 - 5
backend/src/dashoo.cn/modi_webapi/app/service/course/detail/detail.go

@@ -40,7 +40,6 @@ func (s CourseDetailService) Update(param *detail.Entity) (*detail.Entity, error
 	}
 	// 设置更新时间
 	param.UpdatedTime = gtime.Now()
-	// todo 更新用户
 	if _, err = s.SafeModel.WherePri(param.Id).Update(param); err != nil {
 		return nil, err
 	}
@@ -97,12 +96,12 @@ func (s CourseDetailService) GetDetailById(id int) (res *detail.Entity, err erro
 }
 
 // 删除
-func (s CourseDetailService) DeleteById(param *detail.DeleteReq) error {
-	dIds := param.Ids
+func (s CourseDetailService) DeleteById(Ids *detail.DeleteIdsReq, param *detail.DeleteUpdReq) error {
 	//设置更新时间
 	param.UpdatedTime = gtime.Now()
-	// todo 更新用户
-	if _, err := s.SafeModel.WherePri(dIds).Update("isDel = 1"); err != nil {
+	// 修改删除状态
+	param.IsDel = 1
+	if _, err := s.SafeModel.WherePri(Ids).Update(param); err != nil {
 		return err
 	}
 	return nil