fix

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
 .idea
 .env
-vender/
+vendor/
+public/uploadify
+storage/databases

app/Http/Controllers/Admin/IndexController.php

@@ -18,7 +18,7 @@ class IndexController extends CommonController
     public function index()
     {
 
-        $data = Tablelist::where('status', '>', '5')->orderby('id', 'asc')->paginate(10);
+        $data = Tablelist::where('status', '>', '1')->orderby('id', 'asc')->paginate(10);
 
         $project = Project::where('display', '=', '1')->get();
 

app/Http/Controllers/Admin/SearchController.php

@@ -44,7 +44,7 @@ class SearchController extends CommonController
                     if(empty($input['user_id']) && empty($input['project_id']))
                     {
                         $table = Table_one::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(home_area+money_bus_area) as area')
@@ -61,7 +61,7 @@ class SearchController extends CommonController
                     if(!empty($input['user_id'])&& empty($input['project_id']))
                     {
                         $table = Table_one::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -83,7 +83,7 @@ class SearchController extends CommonController
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_one::query()
                             ->where('project_id','=',$input['project_id'])
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('id')
                             ->selectRaw('project_id')
                             ->selectRaw('SUM(home_area+money_bus_area) as area')
@@ -103,7 +103,7 @@ class SearchController extends CommonController
                     //搜索收录人 项目名 显示收录人
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_one::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
@@ -134,7 +134,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_two::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(bzc_area) as area')
@@ -147,7 +147,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_two::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -164,7 +164,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_two::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -181,7 +181,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_three::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
@@ -210,7 +210,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_three::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(canbu) as canbu')
@@ -225,7 +225,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_three::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -244,7 +244,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_three::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -263,7 +263,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_three::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
@@ -295,7 +295,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_four::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(quanj) as quanj')
@@ -309,7 +309,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_four::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -328,7 +328,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_four::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -347,7 +347,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_four::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
@@ -378,7 +378,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_five::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(yuqi_mothe1+yuqi_mothe2+yuqi_mothe3+yuqi_mothe4) as yuqi_mothe')
@@ -391,7 +391,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_five::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -409,7 +409,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_five::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -427,7 +427,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_five::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
@@ -459,7 +459,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_six::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(anzhi) as anzhi')
@@ -474,7 +474,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_six::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -494,7 +494,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_six::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -514,7 +514,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_six::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
@@ -575,7 +575,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_seven::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(bzc_area) as bzc_area')->selectRaw('SUM(data2)as data2')
@@ -597,7 +597,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_seven::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -627,7 +627,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_seven::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -657,7 +657,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_seven::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
@@ -748,7 +748,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_eight::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(bzc_area) as bzc_area')->selectRaw('SUM(data2)as data2')
@@ -777,7 +777,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_eight::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -816,7 +816,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_eight::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -855,7 +855,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_eight::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
@@ -929,7 +929,7 @@ class SearchController extends CommonController
                     ];
                     if(empty($input['user_id']) && empty($input['project_id'])){
                         $table = Table_nine::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->groupBy('bzc_name')
                             ->selectRaw('bzc_name')
                             ->selectRaw('SUM(data6) as data6')->selectRaw('SUM(data9)as data9')
@@ -949,7 +949,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['user_id'])&& empty($input['project_id'])){
                         $table = Table_nine::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')
                             ->selectRaw('user_id')
@@ -976,7 +976,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && empty($input['user_id'])){
                         $table = Table_nine::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->groupBy('id')
                             ->selectRaw('project_id')
@@ -1003,7 +1003,7 @@ class SearchController extends CommonController
                     }
                     if(!empty($input['project_id']) && !empty($input['user_id'])){
                         $table = Table_nine::query()
-                            ->where('status','>','5')
+                            ->where('status','>','1')
                             ->where('project_id','=',$input['project_id'])
                             ->where('user_id','=',$input['user_id'])
                             ->groupBy('id')

resources/views/admin/department/index.blade.php

@@ -31,7 +31,7 @@
                     <div class="row">
                         <div class="col-sm-11"></div>
                         <div class="col-sm-1">
-                            @if($user->role>4)
+                            @if($user->role>1)
                                 <a href="{{ url('/department/create') }}" class="btn btn-primary tooltips">
                                     <i class="fa fa-plus"></i>新增</a>
                                 @endif
@@ -55,7 +55,7 @@
                                         <td>{{ $list -> department_name }}</td>
                                         <td>{{ $list -> department_description}}</td>
                                         <td>
-                                            @if($user->role>4)
+                                            @if($user->role>1)
                                                 <a href="{{ url('/department/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                     <i class="fa fa-pencil"></i> 编辑</a>
                                                 @if($list->display == 1)

resources/views/admin/job/index.blade.php

@@ -31,7 +31,7 @@
                     <div class="row">
                         <div class="col-sm-11"></div>
                         <div class="col-sm-1">
-                            @if($user->role>4)
+                            @if($user->role>1)
                                 <a href="{{ url('/job/create') }}" class="btn btn-primary tooltips">
                                     <i class="fa fa-plus"></i>新增</a>
                                 @endif
@@ -55,7 +55,7 @@
                                         <td>{{ $list -> display_name }}</td>
                                         <td>{{ $list -> description}}</td>
                                         <td>
-                                            @if($user->role>4)
+                                            @if($user->role>1)
                                                 <a href="{{ url('/job/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                     <i class="fa fa-pencil"></i> 编辑</a>
                                                 @if($list->display == 1)

resources/views/admin/left-sidebar.blade.php

@@ -41,68 +41,76 @@
                         <a href="{{ url('/') }}"><i class="fa fa-circle-o"></i>信息搜索</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/1'))
+                    @if(Request::url()==url('table/statistics/8'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a>
+                            ">
+                        <a href="{{ url('/table/statistics/8') }}"><i class="fa fa-circle-o"></i>核算单（产权调换）</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/2'))
+                    @if(Request::url()==url('table/statistics/9'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/2') }}"><i class="fa fa-circle-o"></i>违章建筑自行拆除费用申领表</a>
+                            ">
+                        <a href="{{ url('/table/statistics/9') }}"><i class="fa fa-circle-o"></i>核算单（货币补偿）</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/3'))
+                    @if(Request::url()==url('table/statistics/7'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/3') }}"><i class="fa fa-circle-o"></i>残疾人房征补贴审批确认单</a>
+                            ">
+                        <a href="{{ url('/table/statistics/7') }}"><i class="fa fa-circle-o"></i>核算单（货币化安置）</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/4'))
+                    @if(Request::url()==url('table/statistics/1'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/4') }}"><i class="fa fa-circle-o"></i>房屋征收提前搬迁奖励单</a>
+                            ">
+                        <a href="{{ url('/table/statistics/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/5'))
+                    @if(Request::url()==url('table/statistics/6'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/5') }}"><i class="fa fa-circle-o"></i>逾期过渡安置补助费发放单</a>
+                            ">
+                        <a href="{{ url('/table/statistics/6') }}"><i class="fa fa-circle-o"></i>房屋征收安置补贴单</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/6'))
+                    @if(Request::url()==url('table/statistics/4'))
                             active
                             @endif
-                    ">
-                        <a href="{{ url('/table/statistics/6') }}"><i class="fa fa-circle-o"></i>房屋征收安置补贴单</a>
+                            ">
+                        <a href="{{ url('/table/statistics/4') }}"><i class="fa fa-circle-o"></i>房屋征收提前搬迁奖励单</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/7'))
+                    @if(Request::url()==url('table/statistics/2'))
                             active
                             @endif
                     ">
-                        <a href="{{ url('/table/statistics/7') }}"><i class="fa fa-circle-o"></i>核算单（货币化安置）</a>
+                        <a href="{{ url('/table/statistics/2') }}"><i class="fa fa-circle-o"></i>违章建筑自行拆除费用申领表</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/8'))
+                    @if(Request::url()==url('table/statistics/3'))
                             active
                             @endif
                     ">
-                        <a href="{{ url('/table/statistics/8') }}"><i class="fa fa-circle-o"></i>核算单（产权调换）</a>
+                        <a href="{{ url('/table/statistics/3') }}"><i class="fa fa-circle-o"></i>残疾人房征补贴审批确认单</a>
                     </li>
                     <li class="
-                    @if(Request::url()==url('table/statistics/9'))
+                    @if(Request::url()==url('table/statistics/5'))
                             active
                             @endif
                     ">
-                        <a href="{{ url('/table/statistics/9') }}"><i class="fa fa-circle-o"></i>核算单（货币补偿）</a>
+                        <a href="{{ url('/table/statistics/5') }}"><i class="fa fa-circle-o"></i>逾期过渡安置补助费发放单</a>
+                    </li>
+                    <li class="
+                    @if(Request::url()==url('table/statistics/5'))
+                            active
+                            @endif
+                            ">
+                        <a href="{{ url('#') }}"><i class="fa fa-circle-o"></i>成本审计汇总表</a>
                     </li>
+
                 </ul>
             </li>
             <li class="treeview
@@ -127,33 +135,36 @@
                     "><a href="{{ url('/table') }}"><i class="fa  fa-file-text-o"></i>受理案件
                             <i class="fa fa-angle-left pull-right"></i></a>
                         <ul class="treeview-menu">
+                            <li class="@if(Request::url()==url('/table/8'))
+                                    active
+                                    @endif"><a href="{{ url('/table/8') }}"><i class="fa fa-circle-o"></i>核算单（产权调换）</a></li>
+                            <li class="@if(Request::url()==url('/table/9'))
+                                    active
+                                    @endif"><a href="{{ url('/table/9') }}"><i class="fa fa-circle-o"></i>核算单（货币补偿）</a></li>
+                            <li class="@if(Request::url()==url('/table/7'))
+                                    active
+                                    @endif"><a href="{{ url('/table/7') }}"><i class="fa fa-circle-o"></i>核算单（货币化安置）</a></li>
                             <li class="@if(Request::url()==url('/table/1'))
                                     active
                                     @endif"><a href="{{ url('/table/1') }}"><i class="fa fa-circle-o"></i>安置单(货币化安置)</a></li>
+                            <li class="@if(Request::url()==url('/table/6'))
+                                    active
+                                    @endif"><a href="{{ url('/table/6') }}"><i class="fa fa-circle-o"></i>房屋征收安置补贴单</a></li>
+                            <li class="@if(Request::url()==url('/table/4'))
+                                    active
+                                    @endif"><a href="{{ url('/table/4') }}"><i class="fa fa-circle-o"></i>房屋征收提前搬迁奖励单</a></li>
                             <li class="@if(Request::url()==url('/table/2'))
                                     active
                                     @endif"><a href="{{ url('/table/2') }}"><i class="fa fa-circle-o"></i>违章建筑自行拆除费用申领表</a></li>
                             <li class="@if(Request::url()==url('/table/3'))
                                     active
                                     @endif"><a href="{{ url('/table/3') }}"><i class="fa fa-circle-o"></i>残疾人房征补贴审批确认单</a></li>
-                            <li class="@if(Request::url()==url('/table/4'))
-                                    active
-                                    @endif"><a href="{{ url('/table/4') }}"><i class="fa fa-circle-o"></i>房屋征收提前搬迁奖励单</a></li>
                             <li class="@if(Request::url()==url('/table/5'))
                                     active
                                     @endif"><a href="{{ url('/table/5') }}"><i class="fa fa-circle-o"></i>逾期过渡安置补助费发放单</a></li>
-                            <li class="@if(Request::url()==url('/table/6'))
-                                    active
-                                    @endif"><a href="{{ url('/table/6') }}"><i class="fa fa-circle-o"></i>房屋征收安置补贴单</a></li>
-                            <li class="@if(Request::url()==url('/table/7'))
-                                    active
-                                    @endif"><a href="{{ url('/table/7') }}"><i class="fa fa-circle-o"></i>核算单（货币化安置）</a></li>
-                            <li class="@if(Request::url()==url('/table/8'))
-                                    active
-                                    @endif"><a href="{{ url('/table/8') }}"><i class="fa fa-circle-o"></i>核算单（产权调换）</a></li>
-                            <li class="@if(Request::url()==url('/table/9'))
+                            <li class="@if(Request::url()==url('/table/5'))
                                     active
-                                    @endif"><a href="{{ url('/table/9') }}"><i class="fa fa-circle-o"></i>核算单（货币补偿）</a></li>
+                                    @endif"><a href="{{ url('#') }}"><i class="fa fa-circle-o"></i>成本审计汇总表</a></li>
                         </ul>
                     </li>
                     <li class="
@@ -174,55 +185,57 @@
                     <span>案件追踪</span>
                 </a>
             </li>
-            <li class="treeview
+            @if( $user->role > 1 )
+                <li class="treeview
             @if(Request::url()==url('/user_list') ||Request::url()== url('/job') ||Request::url()== url('/project')||Request::url()==url('/department') )
-               active
-            @endif
-            ">
-                <a href="#">
-                    <i class="fa fa-cogs"></i>
-                    <span>系统设置</span>
-                    <i class="fa fa-angle-left pull-right"></i>
-                </a>
-                <ul class="treeview-menu">
-                    <li class="
+                        active
+                     @endif
+                        ">
+                    <a href="#">
+                        <i class="fa fa-cogs"></i>
+                        <span>系统设置</span>
+                        <i class="fa fa-angle-left pull-right"></i>
+                    </a>
+                    <ul class="treeview-menu">
+                        <li class="
                     @if(Request::url()==url('/user_list')||Request::url()==url('/user/create')||Request::url()==url('/user/{id}/edit'))
-                            active
-                            @endif
-                    "><a href="{{ url('/user_list') }}">
-                            <i class="fa fa-circle-o"></i>
-                            <span>用户管理</span></a>
-                    </li>
-                    <li class="
+                                active
+                                @endif
+                                "><a href="{{ url('/user_list') }}">
+                                <i class="fa fa-circle-o"></i>
+                                <span>用户管理</span></a>
+                        </li>
+                        <li class="
                     @if(Request::url()==url('/job')||Request::url()==url('/job/create')||Request::url()==url('/job/{id}/edit'))
-                    active
-                    @endif
-                    "><a href="{{ url('/job') }}">
-                            <i class="fa fa-circle-o"></i>
-                            <span>职位管理</span>
-                        </a>
-                    </li>
-                    <li class="
+                                active
+                                @endif
+                                "><a href="{{ url('/job') }}">
+                                <i class="fa fa-circle-o"></i>
+                                <span>职位管理</span>
+                            </a>
+                        </li>
+                        <li class="
                     @if(Request::url()==url('/project')||Request::url()==url('/project/create')||Request::url()==url('/project/{id}/edit'))
-                            active
-                            @endif
-                    "><a href="{{ url('/project') }}">
-                            <i class="fa fa-circle-o"></i>
-                            <span>项目管理</span>
-                        </a>
-                    </li>
-                    <li class="
+                                active
+                                @endif
+                                "><a href="{{ url('/project') }}">
+                                <i class="fa fa-circle-o"></i>
+                                <span>项目管理</span>
+                            </a>
+                        </li>
+                        <li class="
                     @if(Request::url()==url('/department')||Request::url()==url('/department/create')||Request::url()==url('/department/{id}/edit'))
-                            active
-                            @endif
-                    "><a href="{{ url('/department') }}">
-                            <i class="fa fa-circle-o"></i>
-                            <span>机构管理</span>
-                        </a>
-                    </li>
-                </ul>
-            </li>
-            @if( $user->role > 4)
+                                active
+                                @endif
+                                "><a href="{{ url('/department') }}">
+                                <i class="fa fa-circle-o"></i>
+                                <span>机构管理</span>
+                            </a>
+                        </li>
+                    </ul>
+                </li>
+                @endif
+            @if( $user->role > 1)
                 <li class="treeview
             @if(Request::url()==url('/log'))
                         active

resources/views/admin/project/index.blade.php

@@ -31,7 +31,7 @@
                     <div class="row">
                         <div class="col-sm-11"></div>
                         <div class="col-sm-1">
-                            @if($user->role > 4)
+                            @if($user->role > 1)
                                 <a href="{{ url('/project/create') }}" class="btn btn-primary tooltips">
                                     <i class="fa fa-plus"></i>新增</a>
                                 @endif
@@ -53,7 +53,7 @@
                                         <td>{{ $list -> id }}</td>
                                         <td>{{ $list -> project_name }}</td>
                                         <td>
-                                            @if($user->role > 4)
+                                            @if($user->role > 1)
                                                 <a href="{{ url('/project/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                     <i class="fa fa-pencil"></i> 编辑</a>
                                                 @if($list->display == 1)

resources/views/admin/user/userlist.blade.php

@@ -30,7 +30,7 @@
                     <div class="row">
                         <div class="col-sm-11"></div>
                         <div class="col-sm-1">
-                            @if($user->role>4)
+                            @if($user->role>1)
                                 <a href="{{ url('/user/create') }}">
                                     <button class="btn btn-block btn-primary btn-sm">
                                         <i class="fa fa-plus"> 新增</i>
@@ -68,7 +68,7 @@
                                         <td>{{ $list->job_name }}</td>
                                         <td>{{ $list->department }}</td>
                                         <td>
-                                            @if($user->role > 4)
+                                            @if($user->role > 1)
                                                 <a href="{{ url('/user/'.$list->id.'/edit') }}" class="btn btn-primary btn-sm">
                                                     <i class="fa fa-pencil"></i> 编辑</a>
                                                 @if($list->display == 1)