panlumeng 3 years ago
parent
commit
006ca65a78
3 changed files with 22 additions and 4 deletions
  1. 2 1
      app/admin/controller/Cat.php
  2. 3 3
      app/admin/controller/Customer.php
  3. 17 0
      app/common.php

+ 2 - 1
app/admin/controller/Cat.php

@@ -291,7 +291,7 @@ public function edit(){
         return error_show(1002,"参数pid不能为空");
     }
     $cat_desc = isset($this->post['cat_desc']) && $this->post['cat_desc'] !=="" ? trim($this->post['cat_desc']) :"";
-
+    $fund_code = isset($this->post['fund_code']) && $this->post['fund_code'] !== "" ? trim($this->post['fund_code']) : "";
     $specs_id = isset($this->post['specs_id']) && $this->post['specs_id'] !== "" ? $this->post['specs_id'] : [];
     if (empty($specs_id)) {
         return error_show(1002, "参数specs_id不能为空");
@@ -336,6 +336,7 @@ public function edit(){
            // "status"=>$status,
             "cat_desc"=>$cat_desc,
             "is_del"=>0,
+            "fund_code"=>$fund_code,
             "updatetime"=>date("Y-m-d H:i:s"),
             "search"=>$search
         ];

+ 3 - 3
app/admin/controller/Customer.php

@@ -79,7 +79,7 @@ class Customer extends BaseController
         if($status!==""){
             $condition[] = ['status',"=",$status];
         }
-        $pidlist = Db::name("customer_org1")->where($condition)->column("pid");
+        $pidlist = Db::name("customer_org1")->where($condition)->order("addtime desc")->column("pid");
         if(!empty($pidlist)){
             $where[]=[["itemid","in",$pidlist]];
 
@@ -90,7 +90,7 @@ class Customer extends BaseController
                 $where[]=['itemid','=',$pid];
             }
         }
-        $list = Db::name('customer_org1')->where($condition)->page($page,$size)->column("id,pid,name,level,depart_link,creater,addtime,status");
+        $list = Db::name('customer_org1')->where($condition)->page($page,$size)->order("addtime desc")->column("id,pid,name,level,depart_link,creater,addtime,status");
         $var=[];
         foreach ($list as $item) {
             $iten=[];
@@ -103,7 +103,7 @@ class Customer extends BaseController
             $iten['kh']=0;//组织架构
             $var[]=$iten;
         }
-        $itm = Db::name('customer_info')->where($where)->select();
+        $itm = Db::name('customer_info')->order("addtime desc")->where($where)->select();
         foreach ($itm as $vat){
             $inm=[];
             $inm['name']=$vat['companyName'];

+ 17 - 0
app/common.php

@@ -392,6 +392,23 @@ function made($var,$data=[]){
         return made($str['pid'],$data);
     }
 }
+
+function sear($id){
+    $item = Db::name('cat')->where(['id'=>$id])->field("search")->find();
+    if($item==false){
+       return false;
+    }else{
+        $temp = Db::name('cat')->where(['pid'=>$id,'is_del'=>0])->select();
+    }
+    $var =[];
+    foreach ($temp as $value){
+        $value['search']=$item['search']."_".$value['cat_name'];
+        $var[]=$value;
+    }
+    $list = Db::name('cat')->save($var);
+    return sear($id);
+}
+
 function manger($list=[],$level=1){
     $var = Db::name('cat')->where(['pid'=>$list,'level'=>$level+1])->column("id");
     if(empty($var)){