|
|
@@ -270,7 +270,7 @@ class UserController extends BaseController
|
|
|
]);
|
|
|
$condition = $filter['condition'];
|
|
|
$params = $filter['params'];
|
|
|
- $condition .= ' AND UI.DELETED=0 AND U.REG_FROM=0';
|
|
|
+ $condition .= ' AND U.DELETED=0 AND U.REG_FROM=0';
|
|
|
$listObj = new IndexList();
|
|
|
$data = $listObj->getList(['condition' => $condition, 'params' => $params]);
|
|
|
return static::notice($data);
|
|
|
@@ -1489,7 +1489,7 @@ class UserController extends BaseController
|
|
|
]);
|
|
|
$condition = $filter['condition'];
|
|
|
$params = $filter['params'];
|
|
|
- $condition .= ' AND UI.DELETED=0';
|
|
|
+ $condition .= ' AND U.DELETED=0';
|
|
|
$data = UserInfo::lists($condition, $params, [
|
|
|
'orderBy' => 'UI.CREATED_AT DESC',
|
|
|
'from' => UserInfo::tableName() . ' AS UI',
|