ad

app/admin/controller/Base.php

@@ -49,12 +49,10 @@ class Base extends \app\BaseController
                 if($value['action']==1){
                     if($value['share_user']!="")  $action['write'].=",".$share['share_user'] ;
                 }
-                if($value['action']===0){
-                    if($value['share_user']!="")  $action['read'].=",".$share['share_user'] ;
-                }
             }
         }
-        $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->select();
+        $group = Db::name("role_group")->where(['is_del'=>0,"status"=>1])->field("FIND_IN_SET(34,group_user) as 
+        test")->having("test > 0")->select();
 
     }
 }

app/admin/controller/Reorder.php

@@ -95,7 +95,7 @@ class Reorder extends \app\BaseController
                             Db::rollback();
                             return error_show(1005,"地址已发货");
                         }
-                        if($val['is_stock']==1){
+                        if($order['is_stock']==1){
                                 if ($addrinfo['receipt_quantity'] < $val['return_num']) {
                                     Db::rollback();
                                     return error_show(1004, "地址发货数量不足");
@@ -255,9 +255,7 @@ class Reorder extends \app\BaseController
                     if ($st_up == false) {
                         return error_show(1005, '可售商品入库失败');
                     }
-                    $good_data = ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ?
-                        $stock['id'] : Db::name
-                        ("good_stock")->getLastInsID(), "type" => 1, 'stock' => $thnum, "stock_name" => "usable_stock"];
+                    $good_data = ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $thnum, "stock_name" => "usable_stock"];
                     GoodLog::LogAdd($this->post['token'], $good_data, 'QRTHD');
                 }