|
|
@@ -449,7 +449,7 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
|
|
|
page.SetCurrent(1)
|
|
|
}
|
|
|
|
|
|
- var departmentId int
|
|
|
+ //var departmentId int
|
|
|
//if req.SellerType == 1 {
|
|
|
// departmentId = crm.SellerDepartmentId
|
|
|
//} else if req.SellerType == 2 {
|
|
|
@@ -815,25 +815,25 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
|
|
|
|
|
|
fmt.Println("totalMoneySlice:", len(totalMoneySlice))
|
|
|
|
|
|
- if req.SellerType == 1 {
|
|
|
- departmentId = crm.SellerDepartmentId
|
|
|
- } else if req.SellerType == 2 {
|
|
|
- departmentId = crm.RaiSellerDepartmentId
|
|
|
- } else if req.SellerType == 0 {
|
|
|
- resp.FailMsg("查询错误", "请选择正确的销售类型", c)
|
|
|
- return
|
|
|
- } else {
|
|
|
- resp.FailMsg("查询错误", "请选择正确的销售类型", c)
|
|
|
- return
|
|
|
- }
|
|
|
+ //if req.SellerType == 1 {
|
|
|
+ // departmentId = crm.SellerDepartmentId
|
|
|
+ //} else if req.SellerType == 2 {
|
|
|
+ // departmentId = crm.RaiSellerDepartmentId
|
|
|
+ //} else if req.SellerType == 0 {
|
|
|
+ // resp.FailMsg("查询错误", "请选择正确的销售类型", c)
|
|
|
+ // return
|
|
|
+ //} else {
|
|
|
+ // resp.FailMsg("查询错误", "请选择正确的销售类型", c)
|
|
|
+ // return
|
|
|
+ //}
|
|
|
|
|
|
adminOB := new(crm.Admin)
|
|
|
adminPars := make([]interface{}, 0)
|
|
|
- adminCond := ` department_id = %d `
|
|
|
- adminCond = fmt.Sprintf(adminCond, departmentId)
|
|
|
+ adminCond := ` `
|
|
|
+ //adminCond = fmt.Sprintf(adminCond, departmentId)
|
|
|
|
|
|
if !req.ShowResign {
|
|
|
- adminCond += ` AND enabled = 1 `
|
|
|
+ adminCond += ` enabled = 1 `
|
|
|
}
|
|
|
|
|
|
adminList, e := adminOB.List(adminCond, adminPars)
|
zwxi