修改

Controller/Finance/Account.Class.php

@@ -192,9 +192,10 @@ class Account extends BaseController
         if( empty($params) ){
             $this->sendOutput('参数为空', ErrorCode::$paramError );
         }
-
+        $includeMaster = true;
         if(isset($params['shopId']) && !empty($params['shopId'])) {
             $selectParams['shopId'] = $params['shopId'];
+            $includeMaster = empty($params['includeMaster']) ? true : false;
         }
         if(isset($params['enableStatus']) && !empty($params['enableStatus'])) {
             $selectParams['enableStatus'] = $params['enableStatus'];
@@ -216,7 +217,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();

Model/Finance/MAccount.Class.php

@@ -199,7 +199,7 @@ class MAccount extends MBaseModel {
      *
      * @return ResultWrapper
      */
-    public function getAllAccount($selectParams)
+    public function getAllAccount($selectParams,$includeMaster = true)
     {
         $limit = $selectParams['limit'];
         unset($selectParams['limit']);
@@ -208,7 +208,8 @@ class MAccount extends MBaseModel {
 
         $whereSql = ' where  enterpriseId = '.$this->enterpriseId .' and deleteStatus = '.StatusCode::$standard;
         if (isset($selectParams['shopId']) && !empty($selectParams['shopId'])) {
-            $whereSql .= ' and shopId in ( ' . $selectParams['shopId'] .',0'.')';
+            $inMasterSql = $includeMaster ? ",0" : "";
+            $whereSql .= ' and shopId in ( ' . $selectParams['shopId'] .$inMasterSql.')';
         }
 
         $totalSql = 'SELECT COUNT(1) as count FROM ' .$this->objDAccount->get_Table() . $whereSql;