|
@@ -48,9 +48,9 @@ class School extends Controller
|
|
|
// 加载对应数据列表
|
|
|
$this->type = input('type', 'all');
|
|
|
if ($this->type === 'all') {
|
|
|
- $query->where(['is_deleted' => 0, 'status' => 1]);
|
|
|
+ $query->where(['status' => 1]);
|
|
|
} elseif ($this->type = 'recycle') {
|
|
|
- $query->where(['is_deleted' => 0, 'status' => 0]);
|
|
|
+ $query->where(['status' => 0]);
|
|
|
}
|
|
|
// 列表排序并显示
|
|
|
$query->order('sort desc,id desc')->page();
|
|
@@ -126,7 +126,7 @@ class School extends Controller
|
|
|
} else {
|
|
|
// 检查登录账号是否出现重复
|
|
|
if (empty($data['username'])) $this->error('登录账号不能为空!');
|
|
|
- $where = ['username' => $data['username'], 'is_deleted' => 0];
|
|
|
+ $where = ['username' => $data['username']];
|
|
|
if ($this->app->db->name('system_user')->where($where)->count() > 0) {
|
|
|
$this->error("账号已经存在,请使用其它账号!");
|
|
|
}
|