diff --git a/.gitignore b/.gitignore index ece13b3..d5fe2db 100755 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,12 @@ node_modules .user.ini sftp-config.json -.DS_Store \ No newline at end of file +.DS_Store +/crmeb/basic/BaseAuth.php +/crmeb/basic/BaseController.php +/crmeb/basic/BaseManager.php +/crmeb/basic/BaseMessage.php +/crmeb/basic/BaseStorage.php +/crmeb/basic/BaseUpload.php +/.constant +/config/crmeb.php diff --git a/app/common/dao/user/UserGroupDao.php b/app/common/dao/user/UserGroupDao.php index 9af39e7..c232932 100644 --- a/app/common/dao/user/UserGroupDao.php +++ b/app/common/dao/user/UserGroupDao.php @@ -47,7 +47,7 @@ class UserGroupDao extends BaseDao */ public function search(array $where = []) { - return UserGroup::getDB(); + return UserGroup::getDB()->where($where); } /** diff --git a/app/controller/admin/user/UserGroup.php b/app/controller/admin/user/UserGroup.php index 62ec117..bcc018b 100644 --- a/app/controller/admin/user/UserGroup.php +++ b/app/controller/admin/user/UserGroup.php @@ -58,7 +58,9 @@ class UserGroup extends BaseController public function lst() { [$page, $limit] = $this->getPage(); - return app('json')->success($this->repository->getList([], $page, $limit)); + $where = array(); + $where[] = ['group_id', '>', 1]; + return app('json')->success($this->repository->getList($where, $page, $limit)); } /** diff --git a/view/admin/.env.development b/view/admin/.env.development index 43d3224..fc9c806 100644 --- a/view/admin/.env.development +++ b/view/admin/.env.development @@ -4,7 +4,7 @@ ENV = 'development' // http://mer.crmeb.net/admin # base api # VUE_APP_BASE_API = 'http://0.0.0.0:8324' -VUE_APP_BASE_API = 'https://mer1.crmeb.net' +VUE_APP_BASE_API = 'https://b2.njrenzhou.com' # socket 连接地址 #VUE_APP_WS_URL = 'ws://0.0.0.0:8324'