fix a bug change sql

app/Http/Controllers/Admin/CommonController.php

@@ -1 +1 @@
-<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/public/img',$newName);
     $filepath = 'img/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
   $role = Job::where('role',$user['role'])->first();

//   dd($user);
    View::share('user',$user);
    View::share('project',$project);
    View::share('role',$role);
  }

 }
+<?php
 namespace App\Http\Controllers\Admin;

 use App\Http\Controllers\Controller;
 use App\Model\Job;
 use App\Model\Project;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\Facades\Session;
 class CommonController extends Controller{


  public function upload()
  {
   $file = Input::file('Filedata');
   if($file){
     $realPath = $file->getRealPath();
     $entension = $file->getClientOriginalExtension();
     $newName = date('YmdHis').mt_rand(100,999).'.'.$entension;
     $path = $file->move(base_path().'/public/img',$newName);
     $filepath = 'img/'.$newName;
    return $filepath;
   }

  }

  public function __construct()
  {

   $user = session('user');
   $project = Project::where('display',1)->get();
   $role = Job::where('id',$user['role_id'])->first();

//   dd($user);
    View::share('user',$user);
    View::share('project',$project);
    View::share('role',$role);
  }

 }

app/Http/Controllers/Admin/JobController.php

@@ -60,6 +60,7 @@ class JobController extends CommonController{
     public function store()
     {
         $input = Input::except('_token');
+        $input['display'] = '1';
         $re = Job::create($input);
         if($re){
             return redirect('job');

app/Http/Controllers/Admin/UserController.php

@@ -45,6 +45,9 @@ class UserController extends CommonController
             'surname.required'=>'姓名不能为空！'
         ];
         $validator = Validator::make($input,$rules,$msg);
+        $job_role = Job::find($input['role_id']);
+        $input['role'] = $job_role->role;
+        $input['job_name'] = $job_role->display_name;
         if($validator->passes()){
             $input['pswd'] = Crypt::encrypt($input['pswd']);
             $re = User::find($user_id)->update($input);
@@ -80,6 +83,9 @@ class UserController extends CommonController
             'surname.required'=>'姓名不能为空！'
         ];
         $validator = Validator::make($input,$rules,$msg);
+        $job_role = Job::find($input['role_id']);
+        $input['role'] = $job_role->role;
+        $input['job_name'] = $job_role->display_name;
         if($validator->passes()){
             $input['pswd'] = Crypt::encrypt($input['pswd']);
             $re = User::create($input);

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

@@ -183,10 +183,10 @@
                         <tr>
                             <td>职位</td>
                             <td>
-                                <select class="form-control" name="role">
+                                <select class="form-control" name="role_id">
                                     <option value=""></option>
                                     @foreach($user_job as $value)
-                                        <option value="{{$value->role}}">{{$value->display_name}}</option>
+                                        <option value="{{$value->id}}">{{$value->display_name}}</option>
                                     @endforeach
                                 </select>
                             </td>

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

@@ -152,9 +152,9 @@
                         <tr>
                             <td>职位</td>
                             <td>
-                                <select class="form-control" name="role">
+                                <select class="form-control" name="role_id">
                                     @foreach($user_job as $value)
-                                        <option value="{{$value->role}}" @if($data->role == $value->role) selected @endif>{{$value->display_name}}</option>
+                                        <option value="{{$value->id}}" @if($data->role == $value->role) selected @endif>{{$value->display_name}}</option>
                                     @endforeach
                                 </select>
                             </td>

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

@@ -156,15 +156,7 @@
                                     <tr role="row" class="odd">
                                         <td>{{ $list->id }}</td>
                                         <td>{{ $list->name }}</td>
-                                        <td>
-                                            @if($list->role == 0)工作人员@endif
-                                            @if($list->role == 1)核算@endif
-                                            @if($list->role == 2)复核@endif
-                                            @if($list->role == 3)初审@endif
-                                            @if($list->role == 4)监审@endif
-                                            @if($list->role == 5)管理员@endif
-                                            @if($list->role == 6)领导@endif
-                                        </td>
+                                        <td>{{ $list->job_name }}</td>
                                         <td>{{ $list->department }}</td>
                                         <td>
                                             @if($user->role > 4)

resources/views/layouts/admin.blade.php

@@ -87,7 +87,11 @@
                         <ul class="dropdown-menu">
                             <!-- User image -->
                             <li class="user-header">
-                                <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
+                                @if($user->thumb == '' || $user->thumb==null)
+                                    <img src="{{asset('/img/arr.jpg')}}" class="img-circle" alt="User Image">
+                                @else
+                                    <img src="{{asset($user->thumb)}}" class="img-circle" alt="User Image">
+                                @endif
                                 <p>
                                     {{ $user->surname }}
                                     <small>{{ $role->description }}</small>

zcju.sql

@@ -3,7 +3,7 @@
 -- http://www.phpmyadmin.net
 --
 -- Host: localhost
--- Generation Time: 2016-09-02 18:34:12
+-- Generation Time: 2016-09-05 10:42:18
 -- 服务器版本： 5.6.27-0ubuntu1
 -- PHP Version: 5.6.11-1ubuntu3.1
 
@@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `role` (
   `description` varchar(255) NOT NULL COMMENT '描述',
   `role` int(10) NOT NULL COMMENT '权限',
   `display` varchar(10) NOT NULL COMMENT '0隐藏  1显示'
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COMMENT='职位表';
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='职位表';
 
 --
 -- 转存表中的数据 `role`
@@ -96,7 +96,7 @@ CREATE TABLE IF NOT EXISTS `table_list` (
   `fuhe` varchar(100) NOT NULL,
   `chushen` varchar(100) NOT NULL,
   `jianshen` varchar(100) NOT NULL
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COMMENT='总数据表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='总数据表';
 
 -- --------------------------------------------------------
 
@@ -142,21 +142,22 @@ CREATE TABLE IF NOT EXISTS `user` (
   `cardid` varchar(100) NOT NULL COMMENT '证件号',
   `role_id` varchar(10) NOT NULL,
   `display` varchar(10) NOT NULL COMMENT '0：停用  1：启用',
-  `thumb` varchar(255) NOT NULL COMMENT '头像图路径'
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COMMENT='普通用户';
+  `thumb` varchar(255) NOT NULL COMMENT '头像图路径',
+  `job_name` varchar(250) NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COMMENT='普通用户';
 
 --
 -- 转存表中的数据 `user`
 --
 
-INSERT INTO `user` (`id`, `name`, `pswd`, `department`, `education`, `role`, `surname`, `cardname`, `cardid`, `role_id`, `display`, `thumb`) VALUES
-(1, 'admin04', 'eyJpdiI6IlpyN3ViYWlMRDhCNFlick8wVWFhTmc9PSIsInZhbHVlIjoieTJRY3RBcVdVXC9aODZGUUxxaWpJV1E9PSIsIm1hYyI6IjczYjBjNmFhOWZiZTcyMWYzMjZhZTdhOWI3Y2NmY2EwMDFiYzM1MzRkYTc3MGY4MDVjM2MwYTk0ZGIwMzVmMGUifQ==', '海勃湾征拆局', '二本', 3, '李四', '居民身份证', '123456789321458967', '0', '1', ''),
-(2, 'admin02', 'eyJpdiI6IlZ1R0lHN0RBM3pCV3V4N1BYdndUVkE9PSIsInZhbHVlIjoiUHBNdk9QMzRyR2RXM3FvVHRTYjlEQT09IiwibWFjIjoiNDMyZTlmZjdmNTMwYWJkNjgwYWZkMWFmODZhMjgyNGUwODM0MGNlYjdmNDEzYWM0MzgxYzI5ZDFlMzljOGY1YyJ9', '海勃湾征拆局', '二本', 1, '王五', '居民身份证', '789456321456879654', '1', '1', ''),
-(3, 'admin03', 'eyJpdiI6IkkrRXFURjZJdkVBVEQweUhnSUZOclE9PSIsInZhbHVlIjoid0lTeFlwWTc0dTRkNXpWTUZEODNtUT09IiwibWFjIjoiY2JiZTM3Njk5MTQ1ZjBiMmE3OGJmNDc5ZWU5MTBkMjdmMmQ3MDlmM2E5YTcyMmViMGIzYWFhNDE3OWM0ZWQ4ZiJ9', '海勃湾征拆局', '二本', 2, '小六', '居民身份证', '789654123654789632', '2', '1', ''),
-(5, 'admin05', 'eyJpdiI6IlwvWTZLaVEzMjFQSTBNSTFDbXNsaTlRPT0iLCJ2YWx1ZSI6InJLK2lRODRZc3NIWFBcL0FTa3NPNnhnPT0iLCJtYWMiOiIyMWE0ODM3OWRmNTAxZmUzODRjZTU3MDVmN2JjMWZkZjEzNzdiMDNkZTUwMDRkYzQ4YmRhYTE3YzA0MjRlZjliIn0=', '海勃湾征拆局', '二本', 4, '染七', '居民身份证', '789654123654789632', '', '1', ''),
-(6, 'admin01', 'eyJpdiI6InBrdlgyc2d5SzgwTDcxKys5XC9xMmFRPT0iLCJ2YWx1ZSI6IlBEVFZaUXZiMmJYWjdPWjVlWXVrVGc9PSIsIm1hYyI6IjdiNjc2N2MyOWNmODgxZTAzMjJhZTVmYTIyM2JlMzViNzVmZDQ5OTdjN2VlNGUzMTFlYjczM2ViY2E4MWM3ZTcifQ==', '海勃湾征拆局', '二本', 0, '赵三', '居民身份证', '789654123654789632', '', '1', 'img/20160902085742354.jpg'),
-(7, 'admin', 'eyJpdiI6Im11VzA4VFQ4aEVXS1lzR3NOazE2Z1E9PSIsInZhbHVlIjoiQkdZTEdUSll3ZkNaWHVPZ1FjeTFUQT09IiwibWFjIjoiZTBhNzE2YjQ1MzIzNzhhZWE3MzdkYzI2MGZkMGU3OTMwNDk1NmQ2YjVmMGY1NWE3ZmJkMzlmNTYzMzcwZTY3YSJ9', '海勃湾征拆局', '二本', 5, '龙傲天', '居民身份证', '789654123654789632', '', '1', 'img/20160902085742354.jpg'),
-(12, 'admin06', 'eyJpdiI6ImNBWmFJVUNiUTZVSElRNjIxTmNlQmc9PSIsInZhbHVlIjoidDJLdG9LOHRJVGREVXQxWVlxRVpDdz09IiwibWFjIjoiMDg2ZGI2NGJkNzExNWEyMDNmYjI5ZTg2ZWJlZmUwMTYxOGVhYjc3YmYwZjVjZjAzOWIxOTIxMzY4NmVkNDJmNSJ9', '海勃湾征拆局', '二本', 6, '李富贵', '居民身份证', '789654123654789632', '', '1', '');
+INSERT INTO `user` (`id`, `name`, `pswd`, `department`, `education`, `role`, `surname`, `cardname`, `cardid`, `role_id`, `display`, `thumb`, `job_name`) VALUES
+(1, 'admin04', 'eyJpdiI6IlpyN3ViYWlMRDhCNFlick8wVWFhTmc9PSIsInZhbHVlIjoieTJRY3RBcVdVXC9aODZGUUxxaWpJV1E9PSIsIm1hYyI6IjczYjBjNmFhOWZiZTcyMWYzMjZhZTdhOWI3Y2NmY2EwMDFiYzM1MzRkYTc3MGY4MDVjM2MwYTk0ZGIwMzVmMGUifQ==', '海勃湾征拆局', '二本', 3, '李四', '居民身份证', '123456789321458967', '1', '1', '', '初审'),
+(2, 'admin02', 'eyJpdiI6IlZ1R0lHN0RBM3pCV3V4N1BYdndUVkE9PSIsInZhbHVlIjoiUHBNdk9QMzRyR2RXM3FvVHRTYjlEQT09IiwibWFjIjoiNDMyZTlmZjdmNTMwYWJkNjgwYWZkMWFmODZhMjgyNGUwODM0MGNlYjdmNDEzYWM0MzgxYzI5ZDFlMzljOGY1YyJ9', '海勃湾征拆局', '二本', 1, '王五', '居民身份证', '789456321456879654', '4', '1', '', '核算'),
+(3, 'admin03', 'eyJpdiI6IkkrRXFURjZJdkVBVEQweUhnSUZOclE9PSIsInZhbHVlIjoid0lTeFlwWTc0dTRkNXpWTUZEODNtUT09IiwibWFjIjoiY2JiZTM3Njk5MTQ1ZjBiMmE3OGJmNDc5ZWU5MTBkMjdmMmQ3MDlmM2E5YTcyMmViMGIzYWFhNDE3OWM0ZWQ4ZiJ9', '海勃湾征拆局', '二本', 2, '小六', '居民身份证', '789654123654789632', '5', '1', '', '复核'),
+(5, 'admin05', 'eyJpdiI6IlwvWTZLaVEzMjFQSTBNSTFDbXNsaTlRPT0iLCJ2YWx1ZSI6InJLK2lRODRZc3NIWFBcL0FTa3NPNnhnPT0iLCJtYWMiOiIyMWE0ODM3OWRmNTAxZmUzODRjZTU3MDVmN2JjMWZkZjEzNzdiMDNkZTUwMDRkYzQ4YmRhYTE3YzA0MjRlZjliIn0=', '海勃湾征拆局', '二本', 4, '染七', '居民身份证', '789654123654789632', '2', '1', '', '监审'),
+(6, 'admin01', 'eyJpdiI6InBrdlgyc2d5SzgwTDcxKys5XC9xMmFRPT0iLCJ2YWx1ZSI6IlBEVFZaUXZiMmJYWjdPWjVlWXVrVGc9PSIsIm1hYyI6IjdiNjc2N2MyOWNmODgxZTAzMjJhZTVmYTIyM2JlMzViNzVmZDQ5OTdjN2VlNGUzMTFlYjczM2ViY2E4MWM3ZTcifQ==', '海勃湾征拆局', '二本', 0, '赵三', '居民身份证', '789654123654789632', '3', '1', 'img/20160902085742354.jpg', '工作人员'),
+(7, 'admin', 'eyJpdiI6Im11VzA4VFQ4aEVXS1lzR3NOazE2Z1E9PSIsInZhbHVlIjoiQkdZTEdUSll3ZkNaWHVPZ1FjeTFUQT09IiwibWFjIjoiZTBhNzE2YjQ1MzIzNzhhZWE3MzdkYzI2MGZkMGU3OTMwNDk1NmQ2YjVmMGY1NWE3ZmJkMzlmNTYzMzcwZTY3YSJ9', '海勃湾征拆局', '二本', 5, '龙傲天', '居民身份证', '789654123654789632', '6', '1', 'img/20160902085742354.jpg', '管理员'),
+(12, 'admin06', 'eyJpdiI6ImNBWmFJVUNiUTZVSElRNjIxTmNlQmc9PSIsInZhbHVlIjoidDJLdG9LOHRJVGREVXQxWVlxRVpDdz09IiwibWFjIjoiMDg2ZGI2NGJkNzExNWEyMDNmYjI5ZTg2ZWJlZmUwMTYxOGVhYjc3YmYwZjVjZjAzOWIxOTIxMzY4NmVkNDJmNSJ9', '海勃湾征拆局', '二本', 6, '李富贵', '居民身份证', '789654123654789632', '7', '1', '', '领导');
 
 -- --------------------------------------------------------
 
@@ -231,12 +232,12 @@ ALTER TABLE `project`
 -- AUTO_INCREMENT for table `role`
 --
 ALTER TABLE `role`
-  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=8;
+  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=11;
 --
 -- AUTO_INCREMENT for table `table_list`
 --
 ALTER TABLE `table_list`
-  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=26;
+  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT;
 --
 -- AUTO_INCREMENT for table `table_name`
 --
@@ -246,7 +247,7 @@ ALTER TABLE `table_name`
 -- AUTO_INCREMENT for table `user`
 --
 ALTER TABLE `user`
-  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=13;
+  MODIFY `id` int(10) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=16;
 --
 -- AUTO_INCREMENT for table `user_role`
 --