|
|
@@ -21,7 +21,7 @@ class Role extends BaseController{
|
|
|
public function roleList(){
|
|
|
$post=$this->request->only(["status"=>"","role_name"=>"","relaComNo"=>"","companyName"=>"","companyNo"=>"","level"=>"",
|
|
|
"page"=>1,"size"=>10],"post","trim");
|
|
|
- $condition=[];
|
|
|
+ $condition=[["level","<>",1]];
|
|
|
|
|
|
isset($post['status'])&&$post['status']!=="" ? $condition[]=['a.status',"=",$post['status']]:"";
|
|
|
isset($post['role_name'])&&$post['role_name']!=="" ? $condition[]=['a.role_name',"like","%".$post['role_name']."%"]:"";
|
|
|
@@ -281,7 +281,7 @@ class Role extends BaseController{
|
|
|
*/
|
|
|
public function RoleAll(){
|
|
|
$post=$this->request->only(["relaComNo"=>"","companyNo"=>""],"post","trim");
|
|
|
- $where=[];
|
|
|
+ $where=[["level","<>",1]];
|
|
|
if(isset($post['relaComNo']) && $post['relaComNo']!='')$where[]=["companyNo","=",$post['relaComNo']];
|
|
|
if(isset($post['companyNo'])&& $post['companyNo']!='')$where[]=["companyNo","=",$post['companyNo']];
|
|
|
$list =Db::name("role")->alias("a")
|
