molong/sentos
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新目录结构

Browse Source
This commit is contained in:
龙渊
2023-10-21 17:45:00 +08:00
parent 59cc869bb2
commit 664295167d
55 changed files with 1856 additions and 6329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/auth/AuthService.php
+4 -4
View File
@@ -10,7 +10,7 @@ namespace app\services\auth;
use app\model\auth\Users;
use app\model\auth\Permissions;
use sent\tree\Tree;
use Xin\Support\Arr;
use think\facade\Env;
class AuthService{
@@ -52,7 +52,7 @@ class AuthService{
public function getAuthMenu(){
$order = "sort asc, id desc";
$map = [];
if(request()->user['uid'] != Env::get('admin_root')){
if(request()->user['uid'] != Env::get('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
$map[] = ['type', '<>', 'button'];
@@ -62,7 +62,7 @@ class AuthService{
$item->hiddenBreadcrumb = (int) $item['hiddenBreadcrumb'];
})->toArray();
return (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
return Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
}
/**
@@ -72,7 +72,7 @@ class AuthService{
*/
public function getAuthPermissions(){
$map = [];
if(request()->user['uid'] != Env::get('admin_root')){
if(request()->user['uid'] != Env::get('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
$list = Permissions::where($map)->select();
app/services/auth/MenuService.php
+3 -5
View File
@@ -9,8 +9,7 @@
namespace app\services\auth;
use app\model\auth\Permissions;
use sent\tree\Tree;
use think\facade\Env;
use Xin\Support\Arr;
class MenuService{
@@ -21,10 +20,9 @@ class MenuService{
* @return void
*/
public function getSystemMenu($is_menu = true, $is_tree = true){
$rootid = Env::get('admin_root');
$order = "sort asc, id desc";
$map = [];
if(request()->user['uid'] != $rootid){
if(request()->user['uid'] != env('ADMIN')){
$map[] = ['name', 'IN', request()->auth()['permission']];
}
if($is_menu){
@@ -37,7 +35,7 @@ class MenuService{
$item->hiddenBreadcrumb = (int) $item['hiddenBreadcrumb'];
})->toArray();
if($is_tree){
$menu = (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
$menu = Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
return $menu;
}else{
app/services/auth/RoleService.php
+2 -2
View File
@@ -11,7 +11,7 @@ namespace app\services\auth;
use app\model\auth\Roles;
use app\model\auth\PermissionAccess;
use app\model\auth\RolesAccess;
use sent\tree\Tree;
use Xin\Support\Arr;
class RoleService{
/**
@@ -36,7 +36,7 @@ class RoleService{
$item->permission_id = $permission_id;
});
if($is_tree){
return (new Tree())->listToTree($list->toArray(), 'id', 'parent_id', 'children');
return Arr::tree($list->toArray(), null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
}else{
return $list;
}
app/services/auth/UsersLogService.php
+4 -4
View File
@@ -10,8 +10,8 @@ namespace app\services\auth;
use app\model\auth\Users;
use app\model\auth\UsersLog;
use xin\helper\Server;
use xin\helper\Time;
use Xin\Support\Server;
use Xin\Support\Time;
class UsersLogService{
@@ -133,7 +133,7 @@ class UsersLogService{
}
protected static function Parser($text) {
$doc = new \doc\Doc();
return $doc->parse($text);
$service = app()->make(\sent\services\DocService::class);
return $service->parse($text);
}
}
app/services/company/CompanyService.php
+119
View File
@@ -0,0 +1,119 @@
<?php
// +----------------------------------------------------------------------
// | SentCMS [ WE CAN DO IT JUST THINK IT ]
// +----------------------------------------------------------------------
// | Copyright (c) 2013 http://www.tensent.cn All rights reserved.
// +----------------------------------------------------------------------
// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
// +----------------------------------------------------------------------
namespace app\services\company;
use app\model\customer\Company;
use app\model\customer\Contact;
/**
* Undocumented class
*/
class CompanyService {
/**
* @title 获取企业列表
*
* @param [type] $request
* @return void
*/
public function getCompanyList($request) {
$param = $request->param();
$map = [];
if (isset($param['name']) && $param['name']) {
$map[] = ['name', 'LIKE', '%' . $param['name'] . '%'];
}
if (isset($param['org_code']) && $param['org_code']) {
$map[] = ['org_code', '=', $param['org_code']];
}
$list = Company::with(['contact'])->where($map)->order('id desc')->paginate($request->pageConfig);
return $list->append(['area_t', 'industry_t']);
}
/**
* @title 获取企业详情
*
* @param [type] $request
* @return void
*/
public function getCompanyDetail($request) {
$param = $request->param();
if (!isset($param['id'])) {
return [];
}
$map = [];
$map[] = ['id', '=', $param['id']];
$data = Company::with(['contact'])->where($map)->find();
return $data->append(['area_t', 'industry_t']);
}
/**
* @title 导入数据
*
* @return void
*/
public function insertCompanyData($request) {
$data = $request->post('data');
$company = new Company();
$contactM = new Contact();
$resultData = [];
foreach ($data as $k => $item) {
$info = [];
if (!is_array($item)) {
continue;
}
foreach ($item as $key => $value) {
if (isset($company->insertFieldAlis[$key])) {
$info[$company->insertFieldAlis[$key]['table']][$company->insertFieldAlis[$key]['name']] = trim($value);
}
}
$info['company']['uid'] = $info['contact']['uid'] = request()->user['uid'];
if (isset($info['company']) && isset($info['company']['name'])) {
$customer = $company->where('name', '=', trim($info['company']['name']))->find();
$company_id = isset($customer['id']) ? $customer['id'] : 0;
if (!$company_id) {
$info['company']['turnover'] = '';
$info['company']['staff_num'] = '';
$info['company']['come_from'] = '';
$info['company']['company_type'] = '';
$info['company']['pc_count'] = '';
$customer = Company::create($info['company']);
$company_id = $customer->id;
} else {
$save_coustomer = $info['company'];
if (!empty($save_coustomer)) {
$save_coustomer['id'] = $company_id;
$result = $customer->save($save_coustomer);
}
}
if (isset($info['contact']['name'])) {
$map = [];
$map[] = ['name', '=', $info['contact']['name']];
$map[] = ['mobile', '=', isset($info['contact']['mobile']) ? $info['contact']['mobile'] : ''];
$map[] = ['company_id', '=', $company_id];
$contact = $contactM->where($map)->find(); //每次查询重新实例化
$contact_id = isset($contact['id']) ? $contact['id'] : 0;
if (!$contact_id) {
$info['contact']['company_id'] = $company_id;
$res = Contact::create($info['contact']);
$contact_id = $res->id;
} else {
$info['contact']['id'] = $contact_id;
$contact->save($info['contact']);
}
} else {
$contact_id = 0;
}
$resultData[] = ['company_id' => $company_id, 'contact_id' => (int) $contact_id, 'company' => $info['company'], 'contact' => $info['contact']];
}
}
return empty($resultData) ? false : $resultData;
}
}
app/services/system/DictionaryService.php
+2 -2
View File
@@ -10,7 +10,7 @@ namespace app\services\system;
use app\model\system\Dictionary;
use app\model\system\DictionaryType;
use sent\tree\Tree;
use Xin\Support\Arr;
class DictionaryService{
/**
@@ -53,7 +53,7 @@ class DictionaryService{
public function getTree($request){
$list = DictionaryType::select()->toArray();
$tree = (new Tree())->listToTree($list, 'id', 'parent_id', 'children');
$tree = Arr::tree($list, null, 0, ['id'=>'id', 'parent' => 'parent_id', 'child' => 'children']);
return $tree;
}
/**