wugg 2 years ago
parent
commit
41a83582e8
2 changed files with 32 additions and 1 deletions
  1. 20 1
      app/admin/controller/Goodup.php
  2. 12 0
      app/common.php

+ 20 - 1
app/admin/controller/Goodup.php

@@ -108,6 +108,25 @@ class Goodup extends Base
               ->group("a.spuCode")->column('a.spuCode');
             $where[]=["spuCode","in",$sta];
         }
+        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $apply_id =GetUserInfo($token);
+        if(empty($apply_id)||$apply_id['code']!=0){
+            return error_show(102,"申请人数据不存在");
+        }
+        $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+        if($rm!=''){
+            $useinfo = Db::name("user_role")->where(['uid'=>$rm,"status"=>1,"is_del"=>0])->find();
+            if($useinfo==false){
+                return error_show(1002,"未找到用户角色权限");
+            }
+            $check = checkRole($useinfo['roleid'],688);
+            if($check){
+                $where[] .=['createrid', "=" ,$rm];
+            }
+        }
 
         $count = Db::name('good_basic')->where($where)->count();
         $total = ceil($count / $size);
@@ -769,7 +788,7 @@ class Goodup extends Base
                             $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
                         }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
-                        $lemp['createrid'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+                        $lemp['creater_id'] = isset($user["data"]['id']) ?  $user["data"]['id'] : "";
                         $lemp['creater'] =isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");

+ 12 - 0
app/common.php

@@ -752,4 +752,16 @@ function GoodPrice($data,$cost_rate=0){
     $rate = ($data['open_fee']/$data['num']+ $data['cost_fee']+$data['packing_fee']+$data["mark_fee"]+$data["cert_fee"]+$data['nake_fee'])/(1-$cost_rate
         );
     return $rate;
+}
+
+function checkRole($roleid,$menu){
+    $roleinfo = Db::name("role_action")->where([['role_id',"=",$roleid],["status","=",1]])->find();
+    if($roleinfo['private_data']!=""){
+
+        $private = explode(",",$roleinfo['private_data']);
+        if(in_array($menu,$private)){
+            return true;
+        }
+    }
+    return false;
 }