fix

wangpengfei

2023-07-18 4324117e156e063cb2a266151724690bd295e180

fix

add Returns department and memberList in an interface

 docs/docs.go

@@ -9109,6 +9109,13 @@
                        "$ref": "#/definitions/model.Country"
                    }
                },
                "department": {
                    "description": "部门",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Department"
                    }
                },
                "enterprise_nature": {
                    "description": "企业性质",
                    "type": "array",
@@ -9130,6 +9137,13 @@
                        "$ref": "#/definitions/model.Industry"
                    }
                },
                "member": {
                    "description": "Member",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.User"
                    }
                },
                "province": {
                    "description": "省份数据",
                    "type": "array",

 docs/swagger.json

@@ -9097,6 +9097,13 @@
                        "$ref": "#/definitions/model.Country"
                    }
                },
                "department": {
                    "description": "部门",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.Department"
                    }
                },
                "enterprise_nature": {
                    "description": "企业性质",
                    "type": "array",
@@ -9118,6 +9125,13 @@
                        "$ref": "#/definitions/model.Industry"
                    }
                },
                "member": {
                    "description": "Member",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/model.User"
                    }
                },
                "province": {
                    "description": "省份数据",
                    "type": "array",

 docs/swagger.yaml

@@ -2766,6 +2766,11 @@
        items:
          $ref: '#/definitions/model.Country'
        type: array
      department:
        description: 部门
        items:
          $ref: '#/definitions/model.Department'
        type: array
      enterprise_nature:
        description: 企业性质
        items:
@@ -2781,6 +2786,11 @@
        items:
          $ref: '#/definitions/model.Industry'
        type: array
      member:
        description: Member
        items:
          $ref: '#/definitions/model.User'
        type: array
      province:
        description: 省份数据
        items:

 model/response/response.go

@@ -211,6 +211,10 @@
        SalesSource []*model.SalesSources `json:"sales_source"`
        // 老客户营销
        RegularCustomers []*model.RegularCustomers `json:"regular_customers"`
        // Member
        Member []*model.User `json:"member"`
        // 部门
        Department []*model.Department `json:"department"`
    }

    DepartmentResponse struct {

 model/user.go

@@ -257,3 +257,16 @@
func (slf *UserSearch) ReplaceMenu(user *User, menus []*Menu) error {
    return slf.Orm.Model(user).Association("Menus").Replace(menus)
}

func (slf *UserSearch) FindAll() ([]*User, error) {
    var (
        records = make([]*User, 0)
        db      = slf.build()
    )

    if err := db.Find(&records).Error; err != nil {
        return records, fmt.Errorf("find all err: %v", err)
    }

    return records, nil
}

 service/dataServer.go

@@ -72,6 +72,14 @@
    regularCustomerList, _ := ServiceGroup.GetRegularCustomersList()
    data.RegularCustomers = regularCustomerList

    // get Member list
    memberList, _ := ServiceGroup.GetUserList()
    data.Member = memberList

    // get Department list
    departmentList, _ := ServiceGroup.GetDepartmentList()
    data.Department = departmentList

    errCode = ecode.OK

    return

 service/user.go

@@ -89,3 +89,7 @@
        "password": encrypt.BcryptHash("123456"),
    })
}

func (userService *UserService) GetUserList() (userList []*model.User, err error) {
    return model.NewUserSearch(nil).FindAll()
}