|
|
@@ -506,7 +506,7 @@ class ShopController extends BaseController {
|
|
|
'GOODS_TITLE' => 'O.GOODS_TITLE',
|
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
|
- 'INVOICE_NO' => 'OG.INVOICE_NO',
|
|
|
+ 'INVOICE_NO' => 'O.INVOICE_NO',
|
|
|
]);
|
|
|
|
|
|
$condition = ' 1=1 ' . $filter['condition'];
|
|
|
@@ -557,7 +557,7 @@ class ShopController extends BaseController {
|
|
|
'GOODS_TITLE' => 'O.GOODS_TITLE',
|
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
|
- 'INVOICE_NO' => 'OG.INVOICE_NO',
|
|
|
+ 'INVOICE_NO' => 'O.INVOICE_NO',
|
|
|
]);
|
|
|
|
|
|
$isSuper = AdminRole::isSuperAdmin(\Yii::$app->getUser()->getUserInfo()['roleId']);
|