Commit 7d783e82 authored by hujun's avatar hujun

site_id

parent ac3bf037
...@@ -1022,6 +1022,11 @@ class Finance extends Basic ...@@ -1022,6 +1022,11 @@ class Finance extends Basic
$select = 1; $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 = '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'; $field .= 'b.house_number,b.father_id,b.order_id,a.real_income_id,a.role,b.scale';
$m_commission = new OPartialCommission(); $m_commission = new OPartialCommission();
......
...@@ -100,7 +100,7 @@ class WorkLearning extends Basic ...@@ -100,7 +100,7 @@ class WorkLearning extends Basic
$where['b.site_id'] = $params['site_id']; $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; $where['a.is_del'] = 0;
try { try {
$work = new RWorkLearningModel(); $work = new RWorkLearningModel();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment