update

application/index/controller/Cabinet.php

@@ -33,6 +33,11 @@ class Cabinet extends Base
     */
     public function AddCabinet(){
         $param = input('param.');
+        $param['cabinet_code'] = $param['number'];
+        $valid = $this->validate($param,'CabinetValidate');
+        if($valid!== true){
+            return json(json_error_exception('1007',$valid));
+        }
 
         $url = urldecode($param['url']);
         $alias = $param['alias'];
@@ -42,7 +47,6 @@ class Cabinet extends Base
         if($count < 0 || $count > 200 || empty($url)) {
             return json(json_error_exception(1007,'参数不正确'));
         }
-
         $CabinetModel = new CabinetModel();
         $flag = $CabinetModel->insertCabinet($url,$alias,$count,$number,$login_key);
         if($flag['code'] != 1){

application/index/controller/User.php

@@ -20,11 +20,12 @@ class User extends Base{
         if (!empty($param['searchText'])) {
             $where['username'] = ['like', '%' . $param['searchText'] . '%'];
         }
-        $user = new UserModel();
-        $selectResult = $user->getUsersByWhere($where, $offset, $limit);
+        $UserModel = new UserModel();
+        $selectResult = $UserModel->getUsersByWhere($where, $offset, $limit);
 
         $status = ['1' => '启用' , '2' => '禁用'];
         $uid = session('id');
+        $user = $UserModel->find($uid);
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $status[$vo['status']];
@@ -34,14 +35,18 @@ class User extends Base{
             if($vo['update_timestamp'] == null){
                 $selectResult[$key]['update_timestamp'] = '';
             }
-            if($vo['id'] == $uid){
-                $selectResult[$key]['is_del'] = false;
+            if($user['rule'] == 1){
+                if($vo['id'] == $uid){
+                    $selectResult[$key]['is_del'] = false;
+                }else{
+                    $selectResult[$key]['is_del'] = true;
+                }
             }else{
-                $selectResult[$key]['is_del'] = true;
+                $selectResult[$key]['is_del'] = false;
             }
         }
 
-        $return['total'] = $user->getAllUsers($where);  //总数据
+        $return['total'] = $UserModel->getAllUsers($where);  //总数据
         $return['rows'] = $selectResult;
         json_success($return);
     }

application/index/model/UserModel.php

@@ -29,7 +29,7 @@ class UserModel extends Model{
      */
     public function getUsersByWhere($where, $offset, $limit)
     {
-        return $this->where($where)->limit($offset, $limit)->order('id desc')->field('id,username,create_timestamp,last_login_ip,last_login_time,status,update_timestamp')->select();
+        return $this->where($where)->limit($offset, $limit)->order('id desc')->field('id,username,create_timestamp,last_login_ip,last_login_time,status,update_timestamp,rule')->select();
     }
 
     /**

application/index/validate/CabinetValidate.php

@@ -7,14 +7,13 @@ use think\Validate;
 class CabinetValidate extends Validate
 {
     protected $rule = array(
-        'url'      => 'require|unique:cabinet',
-        'cabinet_ip'        => 'require|unique:cabinet',
-        'box_number'        => 'number',
+        'cabinet_code'      => 'require|unique:cabinet',
+        'alias'             => 'require|unique:cabinet',
     );
     protected $message = array(
-        'cabinet_name.require'      => '柜子名称已经存在',
-        'cabinet_sort.require'      => '柜子端口已经存在',
-        'cabinet_ip.require'        => '柜子ip已经存在',
-        'box_number.number'         => '箱子数量必须是数字',
+        'cabinet_code.require'      => '柜子编号必须',
+        'cabinet_code.unique'      => '柜子编号已经存在',
+        'alias.require'        => '柜子名称必须',
+        'alias.unique'         => '柜子名称已经存在',
     );
 }

application/index/validate/UserValidate.php

@@ -9,7 +9,8 @@ class UserValidate extends Validate
     protected $rule = array(
         'username'   => 'require|unique:user',
         'password'   => 'require',
-        'repassword' => 'require|confirm:password'
+        'repassword' => 'require|confirm:password',
+        'rule'       => 'require|between:1,2',
     );
     protected $message = array(
         'username.require'    => '用户名必须',
@@ -17,5 +18,7 @@ class UserValidate extends Validate
         'password.require' => '密码必须',
         'repassword.require' => '确认密码必须',
         'repassword.confirm'    => '确认密码和密码必须一致',
+        'rule.require' => '权限必须',
+        'rule.between' => '权限值有误',
     );
 }