Merge branch 'master' of gitee.com:yiguanjia/php

www/protected/controllers/RUserController.php

@@ -34,7 +34,7 @@ class RUserController extends AdminController{
         if ($search != '' && !CommonFn::isMongoId($search)){
             $criteria->source('or', new MongoRegex('/' . $search . '/'));
             $criteria->addCond('user_info.mobile','or', new MongoRegex('/' . $search . '/'));
-            $criteria->addCond('user_info.user_name','or', new MongoRegex('/' . $search . '/'));
+            $criteria->addCond('user_info.name','or', new MongoRegex('/' . $search . '/'));
             $criteria->user_name('or', new MongoRegex('/' . $search . '/'));
             if (CommonFn::isMongoId($search)){
                 $criteria->_id('or', new MongoId($search));