1

application/api_broker/controller/User.php

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

application/index/controller/CostDetail.php

@@ -38,21 +38,21 @@ class CostDetail extends Basic
                 );*/
         $pageNo        = empty($params['pageNo']) ? 1 : $params['pageNo'];
         $pageSize      = empty($params['pageSize']) ? 15 : $params['pageSize'];
-        $activityModel = new CActivity();
         $conditions        = [];
-        // if (!empty($params["title"])) {
-        //     $conditions["title"] = array("like", "%" . trim($params['title']) . "%");
-        // }
+        //计入月份
+        if (!empty($params["setting_date"])) {
+            $conditions["setting_date"] = $params["setting_date"];
+        }
         // if (!empty($params["id"])) {
         //     $conditions["id"] = $params['id'];
         // }
-        $field         = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
-        ';
+        $field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
+                          a.type,a.fee_item,a.purpose,b.store_id,a.assume_fee';
 
-        $list             = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize);
-        $count            = $this->storeCostExt->getStoreCostExtTotal($field, $conditions);
-        $result["list"]   = $list;
-        $result["total"]  = $count;
+        $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);
     }