From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 01 十一月 2023 19:20:21 +0800 Subject: [PATCH] 公海member_id使用0 --- api/v1/serviceFollowup.go | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/api/v1/serviceFollowup.go b/api/v1/serviceFollowup.go index 3c2dda4..ce3bbc5 100644 --- a/api/v1/serviceFollowup.go +++ b/api/v1/serviceFollowup.go @@ -1,11 +1,13 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" "aps_crm/pkg/contextx" "aps_crm/pkg/ecode" + "aps_crm/utils" "github.com/gin-gonic/gin" ) @@ -26,9 +28,25 @@ return } + if params.MemberId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + params.MemberId = userInfo.CrmUserId + } + } errCode, serviceFollowup := checkServiceFollowupParams(params.ServiceFollowup) if errCode != ecode.OK { ctx.Fail(errCode) + return + } + + count, err := model.NewServiceFollowupSearch().SetNumber(serviceFollowup.Number).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") return } @@ -121,6 +139,7 @@ OldMemberId: serviceFollowup.OldMemberId, Remark: serviceFollowup.Remark, File: serviceFollowup.File, + CodeStandID: serviceFollowup.CodeStandID, } return ecode.OK, serviceFollowupModel @@ -132,7 +151,9 @@ // @Summary 鍥炶鍗曠鐞嗗垪琛� // @Produce application/json // @Param object body request.GetServiceFollowupList true "鍙傛暟" -// @Success 200 {object} contextx.Response{data=response.ServiceFollowupResponse} +// +// @Success 200 {object} contextx.Response{data=response.ServiceFollowupResponse} +// // @Router /api/serviceFollowup/list [post] func (con *ServiceFollowupApi) List(c *gin.Context) { var params request.GetServiceFollowupList @@ -141,7 +162,13 @@ return } - serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId) + var memberIds []int + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + memberIds = userInfo.SubUserIds + } + + serviceFollowups, total, errCode := serviceFollowupService.GetServiceFollowupList(params.Page, params.PageSize, params.KeywordType, params.Keyword, params.ServiceOrderId, memberIds) if errCode != ecode.OK { ctx.Fail(errCode) return -- Gitblit v1.8.0