Compare commits

..

No commits in common. "8efca2321e4e40df957518591f8a5d2c83302f53" and "e9ac976f48d9974e2e50e2675157ba1899b663d2" have entirely different histories.

2 changed files with 4 additions and 13 deletions

View File

@ -470,7 +470,7 @@ type ErpPurchaseReportBySupplierReq struct {
IsExport uint32 `json:"is_export"` // 1-导出
PageIndex int `json:"pageIndex"` // 页码
PageSize int `json:"pageSize"` // 页面条数
StoreList []uint32 `json:"store_id"` // 门店复选
StoreList []uint32 `json:"store_list"` // 门店复选
}
// ErpPurchaseReportBySupplierResp 供应商采购汇总出参
@ -4892,13 +4892,8 @@ func GetReportBySupplier(req *ErpPurchaseReportBySupplierReq, c *gin.Context) (
}
if len(req.StoreList) > 0 {
if len(req.StoreList) == 1 {
query = query.Where("erp_purchase_order.store_id = ?", req.StoreList[0])
countQuery = countQuery.Where("erp_purchase_order.store_id = ?", req.StoreList[0])
} else {
query = query.Where("erp_purchase_order.store_id IN (?)", req.StoreList)
countQuery = countQuery.Where("erp_purchase_order.store_id IN (?)", req.StoreList)
}
query = query.Where("erp_purchase_order.store_id IN (?)", req.StoreList)
countQuery = countQuery.Where("erp_purchase_order.store_id IN (?)", req.StoreList)
}
//获取总数

View File

@ -278,11 +278,7 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int, exportFlag int) ([]SysUse
logger.Error("query shopper_promotion_code err:", logger.Field("err", err))
return nil, 0, "", err
}
if shopperCode.ID == 0 {
return nil, 0, "", nil
} else {
e.Uid = shopperCode.Uid
}
e.Uid = shopperCode.Uid
}
var doc []SysUserPage