|
@@ -195,7 +195,10 @@ class Account extends BaseController
|
|
|
$includeMaster = true;
|
|
|
if(isset($params['shopId']) && !empty($params['shopId'])) {
|
|
|
$selectParams['shopId'] = $params['shopId'];
|
|
|
- $includeMaster = empty($params['includeMaster']) ? true : false;
|
|
|
+
|
|
|
+ }
|
|
|
+ if(!empty($params['includeType']) && $params['includeType']==2){
|
|
|
+ $includeMaster = false;
|
|
|
}
|
|
|
if(isset($params['enableStatus']) && !empty($params['enableStatus'])) {
|
|
|
$selectParams['enableStatus'] = $params['enableStatus'];
|