1

application/api_broker/controller/User.php

@@ -162,9 +162,9 @@ class User extends Basic
                 }
 
                 if (isset($params['site_id']) ) {
-                    $conditions['s.site_id'] = $params['site_id'];
+                    $conditions['a.site_id'] = [ 'LIKE', '%' . $params['site_id'] . '%' ];
                 }else{
-                    $conditions['s.site_id'] = $this->siteId;
+                    $conditions['a.site_id'] = [ 'LIKE', '%' . $this->siteId. '%' ];
                 }
                 $return_user_list = $this->userModel->selectUserList($field, $conditions, $pageNo, $pageSize, $order);
                 break;

application/index/controller/CostDetail.php

@@ -39,18 +39,16 @@ class CostDetail extends Basic
         $pageNo        = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize      = empty($params['pageSize']) ? 15 : $params['pageSize'];
         $activityModel = new CActivity();
-        $field         = 'id,title,return_type,money,return_action,activity_start_time,activity_end_time,use_period,total,
-        available,get_number,activity_rule,status,create_time';
-        $where_        = [];
+        $field         = 'id,';
+        $conditions        = [];
         if (!empty($params["title"])) {
-            $where_["title"] = array("like", "%" . trim($params['title']) . "%");
+            $conditions["title"] = array("like", "%" . trim($params['title']) . "%");
         }
         if (!empty($params["id"])) {
-            $where_["id"] = $params['id'];
+            $conditions["id"] = $params['id'];
         }
-        $where_["status"] = array("neq", 4);
-        $list             = $this->storeCostExt->getStoreCostExt($field, $where_, $pageNo, $pageSize);
-        $count            = $this->storeCostExt->getStoreCostExtTotal($field, $where_);
+        $list             = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize);
+        $count            = $this->storeCostExt->getStoreCostExtTotal($field, $conditions);
         $result["list"]   = $list;
         $result["total"]  = $count;
         return $this->response("200", "success", $result);

application/model/FStoreCostExt.php

@@ -25,6 +25,7 @@ class FStoreCostExt extends BaseModel
      */
     public function getStoreCostExt($field,$params,$pageNo, $pageSize)
     {
+        $params["b.status"] = 0;
         $result = $this->db_
             ->field($field)
             ->alias('a')
@@ -38,6 +39,7 @@ class FStoreCostExt extends BaseModel
 
     public function getStoreCostExtTotal($field,$params)
     {
+        $params["b.status"] = 0;
         $result = $this->db_
             ->field($field)
             ->alias('a')