reset

app/admin/controller/Menu.php

@@ -48,7 +48,7 @@ class Menu extends BaseController
         if($role==false){
             return app_show(0,"获取成功",[]);
         }
-        $data= Db::name("view_menu")->where('aid',"in",explode(",",$role['action_conllect']))->where(['status'=>1,"cstatus"=>1])
+        $data= Db::name("view_menu")->where('aid',"in",explode(",",$role['action_conllect']))->where(['status'=>1,"cstatus"=>1,"is_display"=>1])
             ->order("weight desc,id asc,cweight desc,cid asc")->select();
 
         $list=[];
@@ -84,14 +84,6 @@ class Menu extends BaseController
      */
     public function MenuEdit(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         if($id!=""){
             $menu = Db::name("admin_menu")->where("id","=",$id)->find();
@@ -145,14 +137,7 @@ class Menu extends BaseController
      */
     public function MenuStatus(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu = Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -177,14 +162,7 @@ class Menu extends BaseController
      */
     public function   MenuAllList(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
+
         $data = Db::name("admin_menu")->where(['pid'=>0,'is_del'=>0])->order("weight desc,id asc")->select();
         $l=[];
         foreach ($data as $key=>$value){
@@ -207,14 +185,6 @@ class Menu extends BaseController
 
     public function MenuDel(){
         $post  =$this->request->post();
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
-        }
         $id = isset($post['id']) ?intval($post['id']) :"";
         $menu =  Db::name("admin_menu")->where("id","=",$id)->find();
         if($menu==false){
@@ -228,4 +198,22 @@ class Menu extends BaseController
         return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
     }
 
+    /**
+     * @return \think\response\Json|void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function MenuActionDel(){
+        $post  =$this->request->post();
+
+        $id = isset($post['id']) ?intval($post['id']) :"";
+        $menu =  Db::name("action")->where("id","=",$id)->find();
+        if($menu==false){
+            return error_show(1003,"菜单功能信息不存在");
+        }
+
+        $result =  Db::name("action")->delete($menu);
+        return $result ? app_show(0,"删除成功"): error_show(1003,"删除失败");
+    }
 }

app/admin/controller/User.php

@@ -77,8 +77,8 @@ class User extends BaseController
         $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
         $data['depart']="";
         if(!empty($depart)){
-            $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
-            $data['depart'] = implode(",",$deparname);
+            $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
+            $data['depart'] = $deparname;
         }
         return app_show(0,"获取成功",$data);
     }
@@ -138,7 +138,8 @@ class User extends BaseController
             $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
             if(!empty($depart)){
-                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name")->select();
+                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
+                    ->select();
                 $value['depart'] = $deparname;
             }
             $list[]=$value;
@@ -182,7 +183,8 @@ class User extends BaseController
             $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
             if(!empty($depart)){
-                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name")->select();
+                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name,depart_link")
+                    ->select();
                 $value['depart'] = $deparname;
             }
             $list[]=$value;
@@ -269,6 +271,18 @@ class User extends BaseController
                 return error_show(1002,"角色已禁用");
             }
         }
+        $itemid = isset($post['item'])&&$post['item']!=="" ?$post['item'] :"";
+        $item_arr = [];
+        if($itemid!==""){
+            foreach ($itemid as $value){
+                $item_arr[]=end($value);
+            }
+           $iteminfo = Db::name("company_item")->where(["id"=>$item_arr,'is_del'=>0])->select()->toArray();
+           if(empty($iteminfo)){
+               return error_show(1002,"未找到部门信息");
+           }
+        }
+
         Db::startTrans();
         try{
 
@@ -298,6 +312,29 @@ class User extends BaseController
                 if(!empty($save) && $save['code']!=0){
                     Db::rollback();
                     return error_show($save['code'],$save['message']);
+                }
+                 Db::name("depart_user")->where(["uid"=>$userid])->save(['is_del'=>1]);
+                if(isset($item_arr)&&!empty($item_arr)){
+                    foreach ($item_arr as $v){
+                        $depin =[
+                            "uid"=>$userid,
+                            "nickname"=>$nickname,
+                            "itemid"=>$v,
+                            "is_del"=>0,
+                            "updatetime"=>date("Y-m-d H:i:s")
+                        ];
+                       $ist =  Db::name("depart_user")->where(["uid"=>$userid,"itemid"=>$v])->find();
+                       if($ist){
+                          $up = Db::name("depart_user")->where(["uid"=>$userid,"itemid"=>$v])->save($depin);
+                       }else{
+                           $depin['addtime']=date("Y-m-d H:i:s");
+                          $up = Db::name("depart_user")->insert($depin);
+                       }
+                       if($up==false){
+                           Db::rollback();
+                           return error_show(1005,'用户部门更新失败');
+                       }
+                    }
                 }
                 Db::commit();
                 return app_show(0,"更新成功");

app/admin/route/app.php

@@ -16,7 +16,6 @@ Route::rule('menu', 'admin/Menu/list');
 Route::rule('menusave', 'admin/Menu/MenuEdit');
 Route::rule('menudel', 'admin/Menu/MenuDel');
 Route::rule('menustatus', 'admin/Menu/MenuStatus');
-Route::rule('menustatus', 'admin/Menu/MenuStatus');
 Route::rule("menulist","admin/Menu/MenuAllList");
 
 
@@ -24,8 +23,9 @@ Route::rule('menuaction', 'admin/Action/ActionList');
 Route::rule('menuactionsave', 'admin/Action/ActionSave');
 Route::rule('menuactionstatus', 'admin/Action/ActionStatus');
 Route::rule('menuactionadd', 'admin/Action/ActionAdd');
-
 Route::rule("menuactionlist","admin/Action/index");
+Route::rule("menuactiondel","admin/Menu/MenuActionDel");
+
 Route::rule("actiondata","admin/Action/DataAction");
 Route::rule("actionsave","admin/Action/ActionSave");
 Route::rule("actionstatus","admin/Action/ActionStatus");