|
@@ -184,7 +184,7 @@ func (service *BalanceService) UseUserDetailed(duplicateRemoval int64, balanceDa
|
|
|
balanceList := []entity.Balance{}
|
|
|
err = orm.Table(AccountResources).
|
|
|
Select("*").
|
|
|
- Where("accountId=? and companyId=? and departmentId=? and ResourceType=? and endTime>=?", balanceData.AccountId, balanceData.CompanyId, balanceData.DepartmentId, balanceData.ResourceType, time.Now().Format("2006-01-02")).
|
|
|
+ Where("accountId=? and companyId=? and departmentId=? and number>0 and ResourceType=? and endTime>=?", balanceData.AccountId, balanceData.CompanyId, balanceData.DepartmentId, balanceData.ResourceType, time.Now().Format("2006-01-02")).
|
|
|
OrderBy("endTime").
|
|
|
Find(&balanceList)
|
|
|
if err != nil {
|