zxiansheng пре 4 година
родитељ
комит
cf2e8705d8
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 3 1
      common/components/ActiveRecord.php
  2. 1 1
      common/models/EmployLevel.php

+ 3 - 1
common/components/ActiveRecord.php

@@ -284,6 +284,8 @@ class ActiveRecord extends \yii\db\ActiveRecord {
         self::prepare($condition, $params, $argv, true);
         unset($condition, $params, $argv);
         $countQuery = clone self::$query;
+        // self::$rawSql = self::$query->createCommand()->getRawSql();
+        // var_dump(self::$rawSql);exit;
         $count = $countQuery->count(self::$argv['count']); // 得到总数
         $pagination = new Pagination(['totalCount' => $count]);
         $pagination->setPageSize(self::$argv['pageSize']);
@@ -295,7 +297,7 @@ class ActiveRecord extends \yii\db\ActiveRecord {
             self::$query->asArray();
         }
         $lists = self::$query->all();
-        //self::$rawSql = self::$query->createCommand()->getRawSql();
+        
         self::$query = null;
         unset($countQuery);
         $startNum = $pagination->page * $pagination->pageSize + 1;

+ 1 - 1
common/models/EmployLevel.php

@@ -128,7 +128,7 @@ class EmployLevel extends \common\components\ActiveRecord
     public static function getAllDataWithNumIndex(){
         $allData = static::find()->where('1=1')->orderBy('SORT ASC, CREATED_AT ASC')->indexBy('SORT')->asArray()->all();
         foreach($allData as $key=>$data){
-            if($data['YC_PERCENT_ARR']){
+            if(isset($data['YC_PERCENT_ARR'])){
                 $allData[$key]['YC_PERCENT_ARR'] = Json::decode($data['YC_PERCENT_ARR']);
             } else{
                 $allData[$key]['YC_PERCENT_ARR'] = [0,0,0,0,0,0,0,0,0,0];