2235

app/admin/controller/Customer.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\BaseController;
+use think\App;
+
+class Customer extends BaseController
+{
+    public $post = "";
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post = $this->request->post();
+    }
+    /*列表*/
+    public function list(){
+
+    }
+}

app/admin/controller/Newfill.php

@@ -21,23 +21,77 @@ class Newfill extends BaseController
     {
         $page = isset($this->post['page']) && $this->post['page'] != "" ? intval($this->post['page']) : 1;
         $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) : 10;
-        $condition = ['pid'=>0];
+        $condition=[];
+        $condition[] = ['is_del',"=",0];
+        isset($this->post['pid']) &&$this->post['pid']!=="" ? $condition[]=["pid","=",$this->post['pid']]: $condition[]=['pid',"=",0];
+        isset($this->post['name'])&&$this->post['name']!=="" ? $condition[]=["name","like","%{$this->post['name']}%"]:"";
+        $nickname = isset($this->post['nickname']) && $this->post['nickname'] !==""? trim($this->post['nickname']) :"";
+        if($nickname!=""){
+            $is= Db::name("depart_user")->where([['nickname','like',"%{$nickname}%"]])->column('itemid');
+           // var_dump($this->post[$nickname]);
+            if(empty($is)){
+                return error_show(1004,"未找到数据");
+            }
+        }
         $count = Db::name("company_item")->where($condition)->count();
-        $page >= ceil($count / $size) ? $page = ceil($count / $size) : " ";
+        $page >= ceil($count / $size) ? $page = ceil($count / $size) : "";
         $list = Db::name("company_item")->where($condition)->page($page, $size)->select();
+       // var_dump(Db::name("company_item")->getLastSql());
 //        $this->carray($this->treelist);
 //        var_dump($this->carray($this->treelist));
         $data=[];
         $act=[];
         foreach ($list as $value){
            // crea($value);
-       // var_dump($value);
+       //var_dump($value);
         $data[]=  crea($value);;
+
         }
        // array_walk($data,function (&$value){
             //$value['child']= array_values($value['child']);
        // });
-        return app_show(0,"获取成功",array_values($data));
+        return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
+    }
+    /*状态*/
+    public function stat(){
+        $id = isset($this->post['id'])?intval($this->post['id']):"";
+        if($id==""){
+            return error_show(1004,"参数id 不能为空");
+        }
+        $s = Db::name('company_item')->where(["id"=>$id])->find();
+        if(empty($s)){
+            return error_show(1005,"未找到部门");
+        }
+        $di = $s['status']==0? "1":"0";
+        $s['status']=$di;
+        $s['updatetime'] = date("Y-m-d H:i:s");
+       // var_dump($s);
+        $ti = Db::name('company_item')->save($s);
+        return app_show(0,"更新成功");
+    }
+    public function userp(){
+        $id = isset($this->post['id'])?intval($this->post['id']):"";
+        if($id==""){
+            return error_show(1004,"参数id 不能为空");
+        }
+        $t = Db::name('depart_user')->where(["id"=>$id,"is_del"=>0])->find();
+        if(empty($t)){
+            return error_show(1005,"未找到用户");
+        }
+        $position = isset($this->post['position'])?intval($this->post['position']):"";
+        if($position!=""){
+            return error_show(1004,"职位 不能为空");
+        }
+        if($position==2){
+            $f = Db::name('depart_user')->where(['itemid'=>$t['itemid'],"is_del"=>0,"position"=>2])->find();
+            if(!empty($f)&& $f['id']!=$id){
+                return error_show(1004,"部门负责任已存在");
+            }
+        }
+        $t['position']=$position;
+        $t['updatetime'] = date("Y-m-d H:i:s");
+        $ti = Db::name('company_item')->save($t);
+        return app_show(0,"修改成功");
     }
     public function add(){
         $token = isset($this->post['token']) ? trim($this->post['token']) : "";

app/admin/route/app.php

@@ -62,4 +62,6 @@ Route::rule('iuserdel','admin/Departuser/userdel');
 Route::rule('userlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');
 Route::rule('userall', 'admin/User/userList');
+Route::rule('stat','admin/Newfill/stat');
+Route::rule('userp','admin/Newfill/userp');
 

app/common.php

@@ -250,6 +250,12 @@ function resetinfo($token,$condition){
 function crea($data)
 {
     $db = Db::name("company_item")->where(['pid'=>$data['id'],'is_del'=>0])->select()->toArray();
+    $d = Db::name("depart_user")->where(['itemid'=>$data['id'],'is_del'=>0])->select()->toArray();
+    if(empty($d)){
+        $data['item']=[];
+    }else{
+        $data['item']=$d;
+    }
    if(empty($db)){
        $data['child']=[];
       return $data;