公海member_id使用0

zhangqian

2023-11-01 530fed8ec225453572d57b15c200ab062c335457

公海member_id使用0

 api/v1/assign.go

@@ -24,11 +24,6 @@
        return

    }



    if params.MemberId == 0 {

        ctx.Fail(ecode.AssignWrongMemberId)

        return

    }



    if len(params.Ids) == 0 {

        ctx.Fail(ecode.AssignWrongId)

        return


 api/v1/client.go

@@ -28,13 +28,6 @@
        return
    }

    if params.MemberId == 0 {
        userInfo := utils.GetUserInfo(c)
        if userInfo.UserType == constvar.UserTypeSub {
            params.MemberId = userInfo.CrmUserId
        }
    }

    errCode, client := checkClientParams(params.Client)
    if errCode != ecode.OK {
        ctx.Fail(errCode)
@@ -116,12 +109,7 @@
    client.Business.IndustryId = params.IndustryId
    client.Business.EnterpriseNatureId = params.EnterpriseNatureId
    client.Business.EnterpriseScaleId = params.EnterpriseScaleId
    //销售负责人为空时为公海客户
    if params.MemberId == 0 {
        client.MemberId = 1
    } else {
        client.MemberId = params.MemberId
    }
    client.CodeStandID = params.CodeStandID

    //if params.Contact.Name != "" {
@@ -215,6 +203,13 @@
        return
    }

    var isPublic bool
    if params.SearchMap != nil && params.SearchMap["is_public"] != nil {
        if v, ok := params.SearchMap["is_public"].(bool); ok {
            isPublic = v
        }
    }
    if !isPublic {
    userInfo := utils.GetUserInfo(c)
    if userInfo.UserType == constvar.UserTypeSub {
        if params.SearchMap == nil {
@@ -222,6 +217,7 @@
        }
        params.SearchMap["member_ids"] = userInfo.SubUserIds
    }
    }

    clients, total, errCode := clientService.GetClientList(params.Page, params.PageSize, params.SearchMap)
    if errCode != ecode.OK {

 constvar/const.go

@@ -32,13 +32,6 @@
    UserTypeSub                         // 子账户
)

type NotAdmin int

const (
    NotAdminAll NotAdmin = iota // 公海
    NotAdminYes                 // 我的客户
)

type SalesStatus int

const (

 model/client.go

@@ -117,16 +117,16 @@
                    db = db.Joins("Member").Where("Member.username LIKE ?", "%"+v+"%")
                }

            case int, uint, int64, float64:
            case int, uint, int64, float64, bool:
                if key == "id" || key == "client_type_id" || key == "client_status_id" || key == "member_id" {
                    db = db.Where(key+" = ?", v)
                }

                if key == "not_admin" {
                    if v == float64(constvar.NotAdminYes) {
                        db = db.Where("clients.member_id != ?", constvar.UserTypeSuper)
                    } else {
                        db = db.Where("clients.member_id = ?", constvar.UserTypeSuper)
                if key == "is_public" {
                    if val, ok := v.(bool); ok {
                        if val {
                            db = db.Where("clients.member_id = ?", 0)
                        }
                    }
                }
            case []int:

 service/assign.go

@@ -13,10 +13,12 @@


func (AssignService) Assign(memberId int, ids []int, modelType string) int {

    // check member exist

    if memberId != 0 {
    _, err := model.NewUserSearch(nil).SetUserId(memberId).First()

    if err != nil {

        return ecode.UserNotExist

    }

    }


    var errCode int

    switch modelType {