ad

app/admin/controller/Base.php

@@ -28,7 +28,8 @@ class Base extends \app\BaseController
         if(!empty($effetc) && $effetc['code']!=0) {
             return error_show($effetc['code'], $effetc['message']);
         }
-        $this->uid=$effetc['data']['user']['id'];
+
+        $this->uid=isset($effetc['data']['user']['id']) ?$effetc['data']['user']['id']:"";
     }
 
     public function  checkRole(){
@@ -38,21 +39,22 @@ class Base extends \app\BaseController
         }
         $action=[];
         $role =Db::name("role_action")->where(["role_id"=>$uid['roleid'],"status"=>1])->find();
-        $action['private_data']=isset($role['private_data'])? $role['private_data']:'';
         $action['action_conllect']=isset($role['action_conllect'])? $role['action_conllect']:'';
-        $action['private_field']=isset($role['private_field'])? $role['private_field']:'';
-        $action['read']=$uid;
-        $action['write']=$uid;
+        $action['write'][]=$uid;
         $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->column("id");
-        $share =Db::name("role_share")->where(["to_user"=>$this->uid,"is_del"=>0,"status"=>1])->whereOr
-        (["to_user"=>$this->uid,"to_group"=>$group])->select();
+        $share =Db::name("role_share")->where(["is_del"=>0,"status"=>1])->whereOr(["to_user"=>$this->uid,"to_group"=>$group])->select();
         if(!empty($share)){
             foreach ($share as $value){
                 $action['action_conllect'].=$value['action_collect']!=""? ",".$value['action_collect']:"";
                 if($value['action']==1){
-                    if($value['share_user']!="")  $action['write'].=",".$share['share_user'] ;
+                    if($value['share_user']!="")  $action['write'][]=$value['share_user'];
+                }
+                if($value['action']===0){
+                    if($value['share_user']!="")  $action['write'][]=$value['share_user'];
                 }
             }
         }
+        $action['action_conllect']=implode(",",array_unique(explode(",",$action['action_conllect'])));
+        return $action;
     }
 }

app/admin/controller/Menu.php

@@ -10,10 +10,9 @@ use think\facade\Db;
 use think\Request;
 
 //菜单
-class Menu extends BaseController
+class Menu extends Base
 {
     public $post="";
-    private $uid = '';
     /**
      * 显示资源列表
      *
@@ -22,31 +21,17 @@ class Menu extends BaseController
     public  function __construct(App $app)
     {
         parent::__construct($app);
-        $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']);
-        }
-        $this->uid = isset($effetc['data']['user']['id']) ? $effetc['data']['user']['id'] :"";
+        $this->post  =$this->request->post();
     }
 
     public function list()
     {
-        $post=$this->request->post();
         $uid = $this->uid;
         if($uid==''){
             return error_show(101,'未找到用户信息');
         }
-        $roleid = Db::name("user_role")->where([["uid","=",$uid],["status","=",1],["is_del","=",0]])->find();
-        if(empty($roleid)){
-            return error_show(1004,'未找到用户权限信息');
-        }
-        $role = Db::name("role_action")->where("role_id","=", $roleid['roleid'])->find();
-        if($role==false){
+        $role =$this->checkRole();
+        if(empty($role)){
             return app_show(0,"获取成功",[]);
         }
         $data= Db::name("view_menu")->where('aid',"in",explode(",",$role['action_conllect']))->where(['status'=>1,"cstatus"=>1,"is_display"=>1])
@@ -65,7 +50,6 @@ class Menu extends BaseController
             $temp['menu_img']=$value['cmenu_img'];
             $temp['menu_route']=$value['cmenu_route'];
             $temp['menu_url']=$value['cmenu_url'];
-            $temp['menu_url']=$value['cmenu_url'];
             $temp['status']=$value['cstatus'];
             $temp['is_private']=$value['cprivate'];
             $temp['is_display']=$value['cis_display'];

app/admin/controller/Sale.php

@@ -3102,8 +3102,7 @@ class Sale extends Base
         try{
             $up =Db::name("order_out")->save($outinfo);
             if($up){
-                $sendnum = Db::name("order_out")->where([['orderCode',"=", $outinfo['orderCode']], ['is_del',"=", 0],
-                    ["status","<",2]])->count();
+                $sendnum = Db::name("order_out")->where([['orderCode',"=", $outinfo['orderCode']], ["status","<",2]])->count();
                 if($sendnum==0 && $einfo['wsend_num']==0){
                     $einfo['status']=2;
                     $einfo['updatetime']=date("Y-m-d H:i:s");

app/admin/controller/User.php

@@ -39,7 +39,6 @@ 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])->column("name");
                 $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("id,name,depart_link");
                 $value['depart_code'] = [];
                 if(!empty($deparname)){
@@ -126,9 +125,6 @@ class User extends BaseController
             }
             $data['depart'] = $deparname;
         }
-//        $info['businessid']=$st['businessid'];
-//        $info['is_main'] = $st['is_main'];
-//        $info['platform']=$stn['platform'];
         $data['platform']=$info;
 
         return app_show(0,"获取成功",$data);