dd

.env

@@ -1 +1 @@
-APP_DEBUG = false
[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn
+APP_DEBUG = true
[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

app/admin/controller/Base.php

@@ -46,7 +46,10 @@ class Base extends \app\BaseController
         $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_collect']!=''){
+                    $act =Db::name("action")->where(['menuid'=>explode(",",$value['action_collect']),"action_code"=>'001'])->column("id");
+                    $action['action_conllect'].=empty($act)?"":",".implode(",",$act);
+                }
                 if($value['action']==1){
                     if($value['share_user']!="")  $action['write'][]=$value['share_user'];
                 }

app/admin/controller/Check.php

@@ -599,11 +599,11 @@ public function edit()
             if($value["value15"]===""){
                 continue;
             }
-            $stock = Db::name("good_stock")->where(["good_type_code"=>$value["value1"],"wsm_code"=>$fo['wsm_code'],
+            $stock = Db::name("good_stock")->where(["spuCode"=>$value["value1"],"wsm_code"=>$fo['wsm_code'],
                 "is_del"=>0])->find();
             $stock_num = isset($stock) ? $stock['usable_stock']:0;
             $insert[]=[
-                "good_type_code"=>$value["value1"],
+                "spuCode"=>$value["value1"],
                 "good_name"=>$value["value2"],
                 "origin_price"=>0,
                 "origin_num"=>isset($stock) ? $stock['usable_stock']:0,

app/admin/controller/Menu.php

@@ -27,6 +27,7 @@ class Menu extends Base
             return error_show(101,'未找到用户信息');
         }
         $role =$this->checkRole();
+//        var_dump($role);
         if(empty($role)){
             return app_show(0,"获取成功",[]);
         }