|
|
@@ -38,8 +38,8 @@ class Role extends BaseController{
|
|
|
$page >=ceil($count/$size) ? $page= (int)ceil($count/$size) :"";
|
|
|
$list=Db::name("role")->alias("a")
|
|
|
->leftJoin("supplier_info b","a.companyNo=b.code")
|
|
|
- ->leftJoin("role_action t","a.id=t.role_id")
|
|
|
- ->field("a.*,b.name as companyName,t.action_conllect as action,t.action_data")
|
|
|
+// ->leftJoin("role_action t","a.id=t.role_id")
|
|
|
+ ->field("a.*,b.name as companyName")
|
|
|
->order("a.addtime desc")
|
|
|
->where($condition)->page($page,$size)->select();
|
|
|
|
