Merge branch 'dev-lzh-0905' into dev

This commit is contained in:
lzh 2025-10-22 15:23:06 +08:00
commit 4687a172f2

View File

@ -422,7 +422,11 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to
session = session.Where("ccl.submit_time >= ?", time.UnixMilli(req.SubmitTimeStart)) session = session.Where("ccl.submit_time >= ?", time.UnixMilli(req.SubmitTimeStart))
} }
if req.CostType != 0 { if req.CostType != 0 {
if req.CostType == 1 {
session = session.Where("cwl.cost_type = ?", req.CostType) session = session.Where("cwl.cost_type = ?", req.CostType)
} else {
session = session.Where("cwl.cost_type in ?", []int{3, 2})
}
} }
if req.User != "" { if req.User != "" {
if utils.IsPhoneNumber(req.User) { if utils.IsPhoneNumber(req.User) {