|
@@ -488,8 +488,20 @@ func (repository *DividendsReturnedOrderRepository) FindOne(queryOptions map[str |
|
@@ -488,8 +488,20 @@ func (repository *DividendsReturnedOrderRepository) FindOne(queryOptions map[str |
488
|
tx := repository.transactionContext.PgTx
|
488
|
tx := repository.transactionContext.PgTx
|
489
|
dividendsReturnedOrderModel := new(models.DividendsReturnedOrder)
|
489
|
dividendsReturnedOrderModel := new(models.DividendsReturnedOrder)
|
490
|
query := sqlbuilder.BuildQuery(tx.Model(dividendsReturnedOrderModel), queryOptions)
|
490
|
query := sqlbuilder.BuildQuery(tx.Model(dividendsReturnedOrderModel), queryOptions)
|
491
|
- query.SetWhereByQueryOption("dividends_returned_order.dividends_returned_order_id = ?", "dividendsReturnedOrderId")
|
|
|
492
|
- query.SetWhereByQueryOption("dividends_returned_order.dividends_returned_order_number = ?", "dividendsReturnedOrderNumber")
|
491
|
+ if dividendsReturnedOrderId, ok := queryOptions["dividendsReturnedOrderId"]; ok && dividendsReturnedOrderId.(int64) != 0 {
|
|
|
492
|
+ query.Where("dividends_returned_order.dividends_returned_order_id = ?", dividendsReturnedOrderId)
|
|
|
493
|
+ }
|
|
|
494
|
+ //query.SetWhereByQueryOption("dividends_returned_order.dividends_returned_order_id = ?", "dividendsReturnedOrderId")
|
|
|
495
|
+ //query.SetWhereByQueryOption("dividends_returned_order.dividends_returned_order_number = ?", "dividendsReturnedOrderNumber")
|
|
|
496
|
+ if dividendsReturnedOrderNumber, ok := queryOptions["dividendsReturnedOrderNumber"]; ok && dividendsReturnedOrderNumber != "" {
|
|
|
497
|
+ query.Where("dividends_returned_order.dividends_returned_order_number = ?", dividendsReturnedOrderNumber)
|
|
|
498
|
+ }
|
|
|
499
|
+ if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
|
|
|
500
|
+ query.Where("company->>'companyId' = '?'", companyId)
|
|
|
501
|
+ }
|
|
|
502
|
+ if orgId, ok := queryOptions["orgId"]; ok && orgId.(int64) != 0 {
|
|
|
503
|
+ query.Where("org->>'orgId' = '?'", orgId)
|
|
|
504
|
+ }
|
493
|
if err := query.First(); err != nil {
|
505
|
if err := query.First(); err != nil {
|
494
|
if err.Error() == "pg: no rows in result set" {
|
506
|
if err.Error() == "pg: no rows in result set" {
|
495
|
return nil, fmt.Errorf("分红退货单不存在")
|
507
|
return nil, fmt.Errorf("分红退货单不存在")
|