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/serviceOrder.go | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/api/v1/serviceOrder.go b/api/v1/serviceOrder.go index 6675774..b03eb64 100644 --- a/api/v1/serviceOrder.go +++ b/api/v1/serviceOrder.go @@ -1,6 +1,7 @@ package v1 import ( + "aps_crm/constvar" "aps_crm/model" "aps_crm/model/request" "aps_crm/model/response" @@ -8,6 +9,7 @@ "aps_crm/pkg/ecode" "aps_crm/pkg/structx" "aps_crm/service" + "aps_crm/utils" "github.com/gin-gonic/gin" "strconv" ) @@ -28,9 +30,25 @@ return } + if params.ServiceManId == 0 { + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + params.ServiceManId = userInfo.CrmUserId + } + } serviceOrder := new(model.ServiceOrder) if err := structx.AssignTo(params, serviceOrder); err != nil { ctx.Fail(ecode.ParamsErr) + return + } + + count, err := model.NewServiceOrderSearch().SetNumber(serviceOrder.ServiceNumber).Count() + if err != nil { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜楠岃瘉澶辫触") + return + } + if count > 0 { + ctx.FailWithMsg(ecode.UnknownErr, "缂栫爜宸插瓨鍦�") return } @@ -67,10 +85,10 @@ } // BatchDelete -// @Tags 鏈嶅姟鍗曠鐞� -// @Summary 鎵归噺鍒犻櫎鏈嶅姟鍗� +// @Tags 鏈嶅姟鍗� +// @Summary 鎵归噺鍒犻櫎鏈嶅姟鍗� // @Produce application/json -// @Param object body request.CommonIds true "鍙傛暟" +// @Param object body request.CommonIds true "鍙傛暟" // @Success 200 {object} contextx.Response{} // @Router /api/serviceOrder/delete [delete] func (s *ServiceOrderApi) BatchDelete(c *gin.Context) { @@ -132,7 +150,13 @@ return } - serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId) + var memberIds []int + userInfo := utils.GetUserInfo(c) + if userInfo.UserType == constvar.UserTypeSub { + memberIds = userInfo.SubUserIds + } + + serviceOrder, total, errCode := service.NewServiceOrderService().GetServiceOrderList(params.Page, params.PageSize, params.QueryClass, params.KeywordType, params.Keyword, params.ServiceContractId, params.SalesDetailsId, memberIds) if errCode != ecode.OK { ctx.Fail(errCode) return -- Gitblit v1.8.0