Compare commits

..

2 Commits

Author SHA1 Message Date
8efca2321e 1.修复供应商采购汇总处的缺陷; 2024-07-30 11:11:03 +08:00
7d0a36dff1 1.修复店员识别码搜索缺陷; 2024-07-30 10:29:07 +08:00
2 changed files with 13 additions and 4 deletions

View File

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

View File

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