Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/j/controllers/HouseKeepingController.php

@@ -12,22 +12,17 @@ class HouseKeepingController extends JBaseController
 
     public function actionList()
     {
-        $pageParams = CommonFn::getPageParams();
 
         $id = intval(Yii::app()->request->getParam('id'));
-        $search = Yii::app()->request->getParam('search', '');
-        $status = intval(Yii::app()->request->getParam('status', 100));
 
-        $criteria = new EMongoCriteria($pageParams);
+
+        $criteria = new EMongoCriteria();
         // id筛选
         if ($id) {
-            $criteria->_id('==', new MongoId($id));
-        }
-        // 状态筛选
-        if ($status != 100) {
-            $criteria->status('==', $status);
+            $criteria->user_id('==', new MongoId($id));
         }
 
+
         $cursor = HouseKeeping::model()->findAll($criteria);
         $rows = CommonFn::getRowsFromCursor($cursor);
         $parsedRows = HouseKeeping::model()->parse($rows);