Account

Controller/Finance/Account.Class.php

@@ -192,9 +192,13 @@ class Account extends BaseController
         if( empty($params) ){
             $this->sendOutput('参数为空', ErrorCode::$paramError );
         }
-
+        $includeMaster = true;
         if(isset($params['shopId']) && !empty($params['shopId'])) {
             $selectParams['shopId'] = $params['shopId'];
+            
+        }
+        if(!empty($params['includeType']) && $params['includeType']==2){
+            $includeMaster = false;
         }
         if(isset($params['enableStatus']) && !empty($params['enableStatus'])) {
             $selectParams['enableStatus'] = $params['enableStatus'];
@@ -216,7 +220,7 @@ class Account extends BaseController
         $pageParams = pageToOffset($params['page']?:1, $params['pageSize']?:10);
         $selectParams['limit'] = $pageParams['limit'];
         $selectParams['offset'] = $pageParams['offset'];
-        $result = $this->objMAccount->getAllAccount($selectParams);
+        $result = $this->objMAccount->getAllAccount($selectParams,$includeMaster);
 
         if($result->isSuccess()){
             $returnData = $result->getData();