Merge branch 'dev' of wugg/useraccount into master

app/controller/CompanyItem.php

@@ -389,12 +389,13 @@ class CompanyItem extends BaseController
     public function getCompanyItemUserByName()
     {
 
-        $company_name = $this->request->post('company_name', '', 'trim');
-
+        $param = $this->request->only(['company_name'=>"","depart_id"=>""], 'post', 'trim');
+		$where=[["is_del","=",0]];
         //先查询所有的部门id(包括子部门)
+        if($param['company_name']!='')$where[]=["name","like",'%' .$param['company_name']. '%'];
+        if($param['depart_id']!='')$where[]=["id","=",$param['id']];
         $company_ids = Db::name("company_item")
-            ->where(['is_del' => 0])
-            ->whereLike('name', '%' . $company_name . '%')
+            ->where($where)
             ->column('id');
 
         $pid = $company_ids;

app/controller/Headquarters.php

@@ -484,7 +484,9 @@ class Headquarters extends BaseController
 
             Db::commit();
 	        $param['type']=1;
-	        Cache::store("redis")->handler()->lpush("companycopy",json_encode($param,JSON_UNESCAPED_UNICODE));
+			
+	        Cache::store("redis")->handler()->lpush("companycopy",json_encode(array_merge($info,$param),
+	        JSON_UNESCAPED_UNICODE));
             return json_show(0, '修改成功');
         } catch (Exception $exception) {
             Db::rollback();
@@ -657,7 +659,7 @@ class Headquarters extends BaseController
 
             if (empty($tmp)) Db::name('supplier_contact')->insert(array_merge($param['contact'], ['addtime' => $param['contact']['updatetime']]));
             else Db::name('supplier_contact')->where(['id' => $tmp['id'], 'is_del' => 0])->update($param['contact']);
-
+			
             Db::name('headquarters')
                 ->where(['code' => $param['contact']['code'], 'is_del' => 0])
                 ->update([
@@ -675,9 +677,9 @@ class Headquarters extends BaseController
                     'is_del' => $param['data']['is_del'],
                     'updater' => $param['data']['updater'],
                     'updaterid' => $param['data']['updaterid'],
-                    'updatetime' => $param['data']['updatetime'],
+                    'updatetime' => date("Y-m-d H:i:s"),
                 ]);
-
+			$this->checkSupplier($param['data'],$param['contact']);
             Db::commit();
 	        $param['data']['type']=3;
 	        Cache::store("redis")->handler()->lpush("companycopy",json_encode($param['data'],JSON_UNESCAPED_UNICODE));
@@ -730,7 +732,7 @@ class Headquarters extends BaseController
 
         $item = Db::name('customer_info')
             ->where($where)
-            ->field("id,companyNo,companyName,area,LENGTH(companyName) as weight")
+            ->field("id,companyNo,companyName,area,LENGTH(companyName) as weight,status")
             ->order(['weight' => 'asc', 'id' => 'desc'])
             ->page($param['page'], $param['size'])
             ->select()
@@ -1128,4 +1130,37 @@ class Headquarters extends BaseController
 
     }
 
+    private function checkSupplier($supplier,$canact){
+    	$hquest = Db::name("headquarters")->where(["code"=>$supplier["code"],"is_del"=>0])->findOrEmpty();
+    	if(empty($hquest)) throw new Exception("未找到供应商关联数据");
+    	if($hquest['relation_code']!='' && $hquest['type']==3){
+    		$comp =  Db::name('headquarters')->where(['code'=>$hquest['relation_code'],'is_del'=>0])->findOrEmpty();
+    		if(empty($comp)) throw new Exception('未找到供应商关联业务公司数据');
+    		$business = Db::name("business")->where(['companyNo'=>$hquest['relation_code'],'is_del'=>0])->findOrEmpty();
+    		if(empty($business)) throw new Exception('未找到供应商关联业务公司数据');
+    		$comp['name'] = $supplier['name'];
+    		!isset($supplier['legaler'])?:$comp['invoice_people'] = $supplier['legaler'];
+    		!isset($supplier['registercode'])?:$comp['invoice_code'] = $supplier['registercode'];
+    		!isset($supplier['license_img'])?:$comp['invoice_img'] = $supplier['license_img'];
+    		$comp['updatetime'] = date("Y-m-d H:i:s");
+    		$ip =  Db::name('headquarters')->save($comp);
+    		if($ip==false) throw new Exception('供应商关联业务公司数据更新失败');
+    		$business['company'] =$supplier['name'];
+    		!isset($supplier['registercode'])?:$business['inv_code'] =$supplier['registercode'];
+    		!isset($supplier['legaler'])?:$business['inv_legaler'] =$supplier['legaler'];
+    		!isset($supplier['registertime'])?:$business['inv_time'] =$supplier['registertime'];
+    		!isset($supplier['addr'])?:$business['addr'] =$supplier['addr'];
+    		!isset($canact['contactor'])?:$business['contactor'] =$canact['contactor'];
+    		!isset($canact['mobile'])?:$business['mobile'] =$canact['mobile'];
+    		!isset($supplier['scope'])?:$business['inv_scope'] =$supplier['scope'];
+    		$business['license_img'] =$supplier['license_img'];
+    		$business['creater'] =$supplier['updater'];
+    		$business['createrid'] =$supplier['updaterid'];
+    		$business['updatetime'] = date('Y-m-d H:i:s');
+    		$bp =  Db::name('business')->save($business);
+    		if($bp==false) throw new Exception('业务公司数据更新失败');
+    		$business['type']=1;
+	        Cache::store('redis')->handler()->lpush('companycopy',json_encode($business,JSON_UNESCAPED_UNICODE));
+    	}
+    }
 }