细节优化

app/admin/controller/Base.php

@@ -52,7 +52,7 @@ class Base extends \app\BaseController
             ->where(["uid"=>$this->uid,"is_del"=>0])
             ->where($where)
             ->findOrEmpty();
-        if(empty($user_role)) return error_show(101,"账户已禁用");
+        if(empty($user_role)) return error_show(101,"没有该公司的默认角色");
 
 
         $this->roleid=$user_role['roleid'];

app/admin/controller/Business.php

@@ -166,9 +166,6 @@ class Business extends Base
 //        $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
 //        if ($company_name !== "") $where[] = ["b.createrid", 'in', get_company_item_user_by_name($company_name)];
 
-        $param['uid']=$this->uid;
-        $param['uname']=$this->uname;
-
         $userCommon = new \app\admin\common\User();
         $rs = $userCommon->handle('bGetList', $param);
         return json_show($rs['code'], $rs['message'],$rs['data']);

app/admin/controller/Menu.php

@@ -72,15 +72,13 @@ class Menu extends Base
         if ($this->level == 1) {
             //超管，获取所有
             $role['action_conllect'] = Db::name('action')
-                ->field('id')
                 ->where(['is_del' => 0, 'status' => 1])
-                ->buildSql();
+                ->column('id');
         } else $role['action_conllect'] = Db::name('user_role')
             ->alias('a')
-            ->field('b.action_conllect')
             ->leftJoin('role_action b', 'b.role_id=a.roleid')
             ->where(['a.uid' => $this->uid, 'a.is_del' => 0, 'a.companyNo' => $post['relaComNo']])
-            ->buildSql();
+            ->value('b.action_conllect');
 
 //        if (empty($role['action_conllect'])) {
 //            return app_show(0, "获取成功", []);
@@ -91,10 +89,11 @@ class Menu extends Base
 
         $data = Db::name("view_menu")
             ->where($where)
-            ->where('aid in '.$role['action_conllect'])
+            ->whereIn('aid',$role['action_conllect'])
             ->order("weight desc,id asc,cweight desc,cid asc")
             ->select()
             ->toArray();
+
         $list = [];
         $act = [];
         foreach ($data as $value) {

app/admin/controller/SaleReport.php

@@ -122,13 +122,17 @@ class SaleReport extends Base
     //【一、管理报表】1.日报_导出
     public function consultDayExport()
     {
-        $param = $this->request->only(['token', 'date' => date('Y-m-d')], 'post', 'trim');
+        $param = $this->request->only(['token', 'date' => date('Y-m-d'),'relaComNo'=>''], 'post', 'trim');
 
+        $rs_1_where=[
+            ['ci.is_del','=',0],
+            ['ci.addtime','between',[$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59']],
+        ];
+        if($param['relaComNo'] !== '') $rs_1_where[]=['co.companyNo','=',$param['relaComNo']];
         $rs_1 = Db::name('consult_info')
             ->alias('ci')
             ->leftJoin('consult_order co', 'co.zxNo=ci.zxNo')
-            ->where('ci.is_del', 0)
-            ->whereBetween('ci.addtime', [$param['date'] . ' 00:00:00', $param['date'] . ' 23:59:59'])
+            ->where($rs_1_where)
             ->group('co.createrid,co.creater')
             ->column('COUNT(ci.id) 当日咨询单数量,SUM(ci.budget_price*ci.num) 金额,co.creater 创建人', 'co.createrid');
 

app/admin/controller/Suppler.php

@@ -705,6 +705,9 @@ class Suppler extends Base
 
         $userCommon = new \app\admin\common\User();
 
+        $param['uid']=$this->uid;
+        $param['uname']=$this->uname;
+
         $rs = $userCommon->handle('upgrade', $param);
 
         return json_show($rs['code'], $rs['message'], $rs['data']);