|
@@ -521,20 +521,18 @@ func (this *SellerController) InvoiceListV2(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- ficcSellers := make([]string,0)
|
|
|
- raiSellers := make([]string,0)
|
|
|
+ ficcSellerIds := make([]string,0)
|
|
|
+ raiSellerIds := make([]string,0)
|
|
|
sellerMap := make(map[int]*crm.SellerAdminWithGroupTeam)
|
|
|
for i := range sellerList {
|
|
|
sellerMap[sellerList[i].SellerId] = sellerList[i]
|
|
|
if sellerList[i].DepartmentId == crm.SellerDepartmentId {
|
|
|
- ficcSellers = append(ficcSellers, strconv.Itoa(sellerList[i].SellerId))
|
|
|
+ ficcSellerIds = append(ficcSellerIds, strconv.Itoa(sellerList[i].SellerId))
|
|
|
} else if sellerList[i].DepartmentId == crm.RaiSellerDepartmentId {
|
|
|
- raiSellers = append(raiSellers, strconv.Itoa(sellerList[i].SellerId))
|
|
|
+ raiSellerIds = append(raiSellerIds, strconv.Itoa(sellerList[i].SellerId))
|
|
|
}
|
|
|
}
|
|
|
- ficcSellerIds := strings.Join(ficcSellers, ",")
|
|
|
- raiSellerIds := strings.Join(raiSellers, ",")
|
|
|
- sellerIds := ""
|
|
|
+ sellerIds := make([]string,0)
|
|
|
|
|
|
if req.SellerType == 1 {
|
|
|
cond += ` AND b.contract_type = 1 `
|