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

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

@@ -230,7 +230,7 @@ class JgEmpolyerController extends JBaseController
         if ($work_time != '') {
             $criteria->work_time('<=',intval($work_time));
         }
-        $criteria->sort('socre',EMongoCriteria::SORT_DESC);
+        $criteria->sort('score',EMongoCriteria::SORT_DESC);
         $cursor = JGEmploye::model()->findAll($criteria);
         $rows = CommonFn::getRowsFromCursor($cursor);
         $parsedRows = JGEmploye::model()->parse($rows);

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

@@ -43,7 +43,7 @@ class QuestionController extends JBaseController
         $score = Yii::app()->request->getParam('score','');
         $jgemp = JGEmploye::get(new MongoId($user_id));
         if (!empty($jgemp)) {
-            $jgemp->score = $score;
+            $jgemp->score = (int)$jgemp->score + (int)$score;
             if ($jgemp->degree >= 1) {
                 $jgemp->degree -= 1;
             } else {

www/protected/modules/j/models/JGEmploye.php

@@ -91,12 +91,14 @@ class JGEmploye extends MongoAr
             return '暂无排名';
         } else {
             $criteria = new EMongoCriteria();
-            $criteria->sort('socre',EMongoCriteria::SORT_DESC);
             $criteria->store_id('==',$newRow['store_id']);
+            $criteria->sort('score',EMongoCriteria::SORT_DESC);
             $tmp = JGEmploye::model()->findAll($criteria);
             $i = 1;
             foreach ($tmp as $key => $value) {
-                if ($key == $newRow['id']) {
+               // var_dump($value->score);
+                //var_dump($i,$key,$newRow,(string)$key == (string)$newRow['id']);
+                if ((string)$key == (string)$newRow['id']) {
                     return $i;
                 } else {
                     $i++;