阶段提交

app/admin/controller/Base.php

@@ -51,13 +51,15 @@ class Base extends \app\BaseController
 
         if ($effetc['data']['level'] != 1) {
             $user_role = Db::name("user_role")
+                ->field('id,roleid')
                 ->where(["uid" => $this->uid, "is_del" => 0])
                 ->where($where)
                 ->findOrEmpty();
             if (empty($user_role)) return error_show(101, "没有该公司的默认角色");
-        }
+            $this->roleid=$user_role['roleid'];
+        }else $this->roleid=1;
+
 
-        $this->roleid=$user_role['roleid'];
 //        $role =Db::name("role")
 //            ->field('id,is_allow_see_price,status')
 //            ->where(["id"=>$user_role['roleid']])

app/admin/controller/Cat.php

@@ -46,12 +46,13 @@ class Cat extends Base
 //        $page = $page >= $total ? $total : $page;
         $list = Db::name('cat')
             ->alias('c')
-            ->field('c.*,u.itemid')
-            ->leftJoin('depart_user u', 'u.uid=c.createrid AND u.is_del=0')
             ->where($where)
             ->page($param['page'], $param['size'])
-            ->cursor();
+            ->select()
+            ->toArray();
         $var = [];
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
 
         foreach ($list as $value) {
             $temp = Db::name('cat_specs')
@@ -70,7 +71,7 @@ class Cat extends Base
                 $temp = [];
             }
             $value['im'] = $temp;
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['createrid']]??'';//implode('/', array_column(GetPart($value['itemid']), 'name'));
             $var[] = $value;
         }
         return app_show(0, '获取成功', ['list' => $var, 'count' => $count]);
@@ -145,12 +146,13 @@ class Cat extends Base
 //        $page = $page >= $total ? $total : $page;
         $list = Db::name('cat')
             ->alias('c')
-            ->field('c.*,u.itemid')
-            ->leftJoin('depart_user u', 'u.uid=c.createrid AND u.is_del=0')
             ->where($where)
             ->page($param['page'], $param['size'])
-            ->cursor();
+            ->select()
+            ->toArray();
         $var = [];
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
         foreach ($list as $value) {
             $temp = Db::name('cat_specs')
                 ->field('a.specs_id,b.spec_name')
@@ -161,7 +163,7 @@ class Cat extends Base
                 ->toArray();
 
             $value['im'] = $temp;
-            $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+            $value['company_name'] = $item[$value['createrid']];//implode('/', array_column(GetPart($value['itemid']), 'name'));
             $var[] = $value;
         }
         return app_show(0, '获取成功', ['list' => $var, 'count' => $count]);

app/admin/controller/Platform.php

@@ -110,6 +110,7 @@ class Platform extends Base
                     $insert_da[] = [
                         'platform_id' => $platform_id,
                         'companyNo' => $pay['companyNo'],
+                        'companyName' => $pay['companyName'],
                         'rate' => $pay['rate'],
                         'status' => 1,
                         'is_del' => 0,
@@ -337,6 +338,7 @@ class Platform extends Base
                     $insert_da[] = [
                         'platform_id' => $param['id'],
                         'companyNo' => $pay['companyNo'],
+                        'companyName' => $pay['companyName'],
                         'rate' => $pay['rate'],
                         'status' => 1,
                         'is_del' => 0,
@@ -396,7 +398,7 @@ class Platform extends Base
         if (empty($info)) return error_show(1004, '未找到数据');
         else {
             $info['pay_list'] = Db::name('platform_pay_rate')
-                ->field('id,companyNo,rate,status')
+                ->field('id,companyNo,companyName,rate,status')
                 ->where(['platform_id' => $info['id'], 'is_del' => 0])
                 ->select()
                 ->toArray();

app/admin/controller/Specs.php

@@ -8,7 +8,7 @@ use think\App;
 use think\facade\Db;
 
 //商品规格
-class Specs extends BaseController
+class Specs extends Base
 {
     public $post="";
     public function __construct(App $app)
@@ -21,16 +21,16 @@ class Specs extends BaseController
         if($spec_name==""){
             return error_show(1002,"参数spec_name不能为空");
         }
-        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(105,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(1002,"创建人数据不存在");
-        }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(105,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(1002,"创建人数据不存在");
+//        }
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $exam_status = isset($this->post['exam_status']) &&$this->post['exam_status'] !==""? intval($this->post['exam_status']):"0";
         $status = isset($this->post['status']) &&$this->post['status'] !==""? intval($this->post['status']):"1";
         $data = [
@@ -58,8 +58,7 @@ class Specs extends BaseController
         if($spec_name!=""){
             $where[]=['s.spec_name',"like","%$spec_name%"];
         }
-        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
-            :"";
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
         if($status!==""){
             $where[]=['s.status',"=",$status];
         }
@@ -86,17 +85,18 @@ class Specs extends BaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('specs')
             ->alias('s')
-            ->field('s.*,u.itemid')
-            ->leftJoin("depart_user u", "u.uid=s.createrid AND u.is_del=0")
             ->where($where)
-            ->append(['company_name'])
-            ->withAttr('company_name',function($val,$data){
-                return implode('/', array_column(GetPart($data['itemid']), 'name'));
-            })
             ->page($page,$size)
             ->order("addtime desc")
             ->select()
             ->toArray();
+
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
+
+        foreach ($list as &$val){
+            $val['company_name']=$item[$val['createrid']]??'';
+        }
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
     public function status(){

app/admin/controller/Unit.php

@@ -8,7 +8,7 @@ use think\App;
 use think\facade\Db;
 
 //单位
-class Unit extends BaseController
+class Unit extends Base
 {
     public $post ="";
     public function __construct(App $app)
@@ -21,16 +21,16 @@ class Unit extends BaseController
         if($unit==""){
             return error_show(1002,"参数unit不能为空");
         }
-        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
-        if($token==''){
-            return error_show(105,"参数token不能为空");
-        }
-        $user =GetUserInfo($token);
-        if(empty($user)||$user['code']!=0){
-            return error_show(1002,"创建人数据不存在");
-        }
-        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
-        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+//        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
+//        if($token==''){
+//            return error_show(105,"参数token不能为空");
+//        }
+//        $user =GetUserInfo($token);
+//        if(empty($user)||$user['code']!=0){
+//            return error_show(1002,"创建人数据不存在");
+//        }
+        $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= $this->uname;//isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $status = isset($this->post['status']) &&$this->post['status'] !==""? intval($this->post['status']):"1";
         $data=[
             "unit"=>$unit,
@@ -56,8 +56,7 @@ class Unit extends BaseController
         if($unit!==""){
             $where[]=['u.unit',"like","%$unit%"];
         }
-        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
-            :"";
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
         if($status!==""){
             $where[]=['u.status',"=",$status];
         }
@@ -78,7 +77,6 @@ class Unit extends BaseController
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["u.createrid", 'in', get_company_item_user_by_name($company_name)];
 
-
         $count = Db::name('unit')
             ->alias('u')
             ->leftJoin("depart_user user", "user.uid=u.createrid AND user.is_del=0")
@@ -88,17 +86,20 @@ class Unit extends BaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('unit')
             ->alias('u')
-            ->field('u.*,user.itemid')
-            ->leftJoin("depart_user user", "user.uid=u.createrid AND user.is_del=0")
             ->where($where)
             ->append(['company_name'])
-            ->withAttr('company_name',function($val,$data){
-                return implode('/', array_column(GetPart($data['itemid']), 'name'));
-            })
             ->page($page,$size)
             ->order("addtime desc")
             ->select()
             ->toArray();
+
+        $all_createrid = array_column($list,'createrid');
+        $item = get_company_name_by_uid($all_createrid);
+
+        foreach ($list as &$val){
+            $val['company_name']=$item[$val['createrid']]??'';
+        }
+
         return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
     }
     public function edit(){
@@ -142,7 +143,7 @@ class Unit extends BaseController
         $json = json_encode($item,JSON_UNESCAPED_UNICODE);
         $jsp = json_encode($info,JSON_UNESCAPED_UNICODE);
         if($datainfo){
-            ChangeLog::logAdd(4,$info['id'],$jsp,$json,$this->post['token'],$this->post);
+            ChangeLog::logAdd(4,$info['id'],$jsp,$json,['id'=>$this->uid,'nickname'=>$this->uname],$this->post);
             return error_show(0,"更新成功");
         }else{
             return error_show(1002,"更新失败");

app/common.php

@@ -1200,7 +1200,7 @@ if (!function_exists('get_company_item_user_by_name')) {
 //$uid int 用户id
 //$get_tops 是否获取多级部门,例如 万宇恒通/采购部/仓储物流,1获取,2不获取(默认)
 if (!function_exists('get_company_name_by_uid')) {
-    function get_company_name_by_uid($uid = 0, $get_tops = 2)
+    function get_company_name_by_uid($uid = '', $get_tops = 2)
     {
         $userCommon = new \app\admin\common\User();