wugg il y a 1 an
Parent
commit
7251260b09
2 fichiers modifiés avec 6 ajouts et 5 suppressions
  1. 5 4
      app/controller/CompanyItem.php
  2. 1 1
      app/controller/Headquarters.php

+ 5 - 4
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;

+ 1 - 1
app/controller/Headquarters.php

@@ -675,7 +675,7 @@ 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"),
                 ]);
 
             Db::commit();