site_id

application/index/controller/Finance.php

@@ -1022,6 +1022,11 @@ class Finance extends Basic
             $select                 = 1;
         }
 
+        if (!empty($this->params['site_id'])) {
+            $where['e.site_id'] = $this->params['site_id'];
+            $select                 = 1;
+        }
+
         $field        = 'a.id,b.id as bargain_id,f.income_time,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,';
         $field        .= 'b.house_number,b.father_id,b.order_id,a.real_income_id,a.role,b.scale';
         $m_commission = new OPartialCommission();

application/index/controller/WorkLearning.php

@@ -100,7 +100,7 @@ class WorkLearning extends Basic
             $where['b.site_id'] = $params['site_id'];
         }
 
-        $where['a.type'] = $type;//0素质测评 1方法分析 2价值观考核
+        $where['a.type'] = $type;//0素质测评 1方法分析 2价值观考核 3忠诚诚信
         $where['a.is_del'] = 0;
         try {
             $work = new RWorkLearningModel();