Merge branch 'test'

application/index/controller/Finance.php

@@ -836,14 +836,6 @@ class Finance extends Basic
             $where['d.internal_address'] = [ 'like', '%' . $this->params['internal_address'] . '%' ];
         }
 
-        if (!empty($this->params['phone'])) {
-            $where['e.phone'] = [ 'like', '%' . $this->params['phone'] . '%' ];
-        }
-
-        if (!empty($this->params['name'])) {
-            $where['e.name'] = [ 'like', '%' . $this->params['name'] . '%' ];
-        }
-
         if (!empty($this->params['house_number'])) {
             $where['b.house_number'] = [ 'like', '%' . $this->params['house_number'] . '%' ];
         }
@@ -860,6 +852,10 @@ class Finance extends Basic
             $where['e.district_id'] = $this->params['district_id'];
         }
 
+        if (!empty($this->params['partial_id'])) {
+            $where['e.id'] = $this->params['partial_id'];
+        }
+
         $field = 'a.id,a.confirm_date,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,cash,service_charge,charity_fund,real_fee,a.real_income_id,a.should_commission';
 
         $m_commission = new OPartialCommission();

application/index/service/UserService.php

@@ -332,7 +332,14 @@ class UserService
         if(!$user_id){
             return false;
         }
-        $res = $this->user->selectUser($user_id, "id,protect_time");
+        $res = $this->user->selectUser($user_id, "id,protect_time,create_time");
+
+        /*先判断客户创建时间是否超过24小时 目的是兼容老数据 2018-10-20号之后的版本可去除此处代码*/
+        if((time() - strtotime($res['create_time'])) < (60*60*24)){
+            return 0;//保护期内
+        }
+        /*目的是兼容老数据 2018-10-20号之后的版本可去除此处代码 end */
+
         if ((time() < strtotime($res['protect_time']))) {
             return 0;//保护期内
         }else{