From 20239dfb6f5cf110f605a6953225ae87a69f588d Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Mon, 11 Aug 2025 20:09:28 +0800 Subject: [PATCH 01/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=8F=9C=E5=8D=95=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CorpFeishuAppController.php | 33 ++ app/admin/controller/CountryController.php | 33 ++ app/admin/controller/SystemsController.php | 16 +- app/admin/service/CorpFeishuAppService.php | 70 ++++ app/admin/service/CountryService.php | 31 ++ app/common/controller/ResourceController.php | 66 ++++ app/common/logic/CorpFeishuAppLogic.php | 11 +- app/common/logic/CountryLogic.php | 17 + app/common/logic/PermLogic.php | 148 +------- app/common/logic/ResourceLogic.php | 17 + app/common/model/CorpFeishuApp.php | 42 +-- app/common/model/InquiryLog.php | 2 +- app/common/model/Resource.php | 51 +-- app/common/service/ResourceService.php | 137 ++++---- .../traits/crud/CrudControllerTrait.php | 1 + app/common/traits/crud/CrudServiceTrait.php | 5 +- app/common/utils/Tree.php | 320 ++++++++++++++++++ app/common/validate/CorpFeishuAppValidate.php | 29 ++ app/common/validate/CountryValidate.php | 29 ++ app/common/validate/ResourceValidate.php | 29 ++ app/controller/IndexController.php | 36 +- .../controller/StatisticsController.php | 2 +- config/route.php | 42 ++- 23 files changed, 855 insertions(+), 312 deletions(-) create mode 100644 app/admin/controller/CorpFeishuAppController.php create mode 100644 app/admin/controller/CountryController.php create mode 100644 app/admin/service/CorpFeishuAppService.php create mode 100644 app/admin/service/CountryService.php create mode 100644 app/common/controller/ResourceController.php create mode 100644 app/common/logic/CountryLogic.php create mode 100644 app/common/logic/ResourceLogic.php create mode 100644 app/common/utils/Tree.php create mode 100644 app/common/validate/CorpFeishuAppValidate.php create mode 100644 app/common/validate/CountryValidate.php create mode 100644 app/common/validate/ResourceValidate.php diff --git a/app/admin/controller/CorpFeishuAppController.php b/app/admin/controller/CorpFeishuAppController.php new file mode 100644 index 0000000..59e685d --- /dev/null +++ b/app/admin/controller/CorpFeishuAppController.php @@ -0,0 +1,33 @@ +service = new CorpFeishuAppService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + protected function indexFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + return $data; + } +} \ No newline at end of file diff --git a/app/admin/controller/CountryController.php b/app/admin/controller/CountryController.php new file mode 100644 index 0000000..8cc8458 --- /dev/null +++ b/app/admin/controller/CountryController.php @@ -0,0 +1,33 @@ +service = new CountryService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + // protected function indexFormat($data) + // { + // if (isset($data['created_at'])) + // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + // if (isset($data['updated_at'])) + // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + // return $data; + // } +} \ No newline at end of file diff --git a/app/admin/controller/SystemsController.php b/app/admin/controller/SystemsController.php index 9c300ac..3c062c5 100644 --- a/app/admin/controller/SystemsController.php +++ b/app/admin/controller/SystemsController.php @@ -22,12 +22,12 @@ class SystemsController extends BaseController * @param array $data * @return array */ - // protected function indexFormat($data) - // { - // if (isset($data['created_at'])) - // $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); - // if (isset($data['updated_at'])) - // $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); - // return $data; - // } + protected function indexFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + return $data; + } } \ No newline at end of file diff --git a/app/admin/service/CorpFeishuAppService.php b/app/admin/service/CorpFeishuAppService.php new file mode 100644 index 0000000..e64631b --- /dev/null +++ b/app/admin/service/CorpFeishuAppService.php @@ -0,0 +1,70 @@ +validator; + } + + /** + * 构建查询条件 + */ + protected function buildQueryConfig(Request $request, string $scene = 'index'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'index': + $config['where']['status'] = 1; + $config['order']['sort'] = 'desc'; + $config['order']['id'] = 'desc'; + + $config['with']['corpInfo'][] = 'name'; + $config['with']['systemInfo'][] = 'name'; + break; + case 'show': + $config['where']['id'] = $p['id']; + $config['where']['status'] = 1; + + $config['with']['corpInfo'][] = 'name'; + $config['with']['systemInfo'][] = 'name'; + break; + case 'store': + break; + case 'update': + $config['where']['id'] = $p['id']; + break; + case 'destroy': + $config['where']['id'] = $p['id']; + break; + } + + return $config; + } +} \ No newline at end of file diff --git a/app/admin/service/CountryService.php b/app/admin/service/CountryService.php new file mode 100644 index 0000000..4139d97 --- /dev/null +++ b/app/admin/service/CountryService.php @@ -0,0 +1,31 @@ +validator; + } +} \ No newline at end of file diff --git a/app/common/controller/ResourceController.php b/app/common/controller/ResourceController.php new file mode 100644 index 0000000..4d81058 --- /dev/null +++ b/app/common/controller/ResourceController.php @@ -0,0 +1,66 @@ +service = new ResourceService(); + } + + /** + * 列表页数据格式化 + * + * @param array $data + * @return array + */ + protected function allFormat($data) + { + if (isset($data['created_at'])) + $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); + if (isset($data['updated_at'])) + $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + return $data; + } + + /** + * 资源树形结构 + */ + public function listTree(Request $request) + { + try { + $raw = $this->service->serviceListAll($request); + $data = $this->transformData($raw, method_exists($this, 'allFormat') + ? [$this, 'allFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + /** + * 菜单 + */ + public function menuList(Request $request) + { + try { + $raw = $this->service->serviceMenuList($request); + $data = $this->transformData($raw, method_exists($this, 'allFormat') + ? [$this, 'allFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } +} \ No newline at end of file diff --git a/app/common/logic/CorpFeishuAppLogic.php b/app/common/logic/CorpFeishuAppLogic.php index e246316..59838c3 100644 --- a/app/common/logic/CorpFeishuAppLogic.php +++ b/app/common/logic/CorpFeishuAppLogic.php @@ -2,15 +2,16 @@ namespace app\common\logic; +use app\common\traits\crud\CrudLogicTrait; use app\common\model\CorpFeishuApp; class CorpFeishuAppLogic { - + use CrudLogicTrait; - public function getFeishuApp($corpId, $systemId) - { - return CorpFeishuApp::where('corp_id', $corpId)->where('system_id', $systemId)->first(['id', 'corp_id', 'name', 'app_id', 'r_url', 'state']); - } + /** + * 指定当前要操作的模型 + */ + protected string $modelClass = CorpFeishuApp::class; } \ No newline at end of file diff --git a/app/common/logic/CountryLogic.php b/app/common/logic/CountryLogic.php new file mode 100644 index 0000000..0a753ee --- /dev/null +++ b/app/common/logic/CountryLogic.php @@ -0,0 +1,17 @@ +roles as $role) { $all = $all->merge( $role->resources->filter(function ($resource) use($system) { - // var_dump($resource->toArray()); // 只保留需要权限认证的资源（或公共资源） return !$resource->no_auth && ($system->id == $resource->system_id || $resource->system_id == 0); }) @@ -64,151 +63,6 @@ class PermLogic * @param string $parentPath 父级完整路径（用于递归） * @return array */ - public function buildTree_bak($resources, int $parentId = 0, string $parentPath = ''): array - { - $tree = []; - - foreach ($resources as $node) { - // 只处理目录和菜单，不把 permission 当作菜单节点 - if ($node->parent_id !== $parentId || $node->type === 'permission') { - continue; - } - - // —— 拼接当前节点的完整路径 —— - $currentPath = rtrim($parentPath, '/'); - if (!empty($node->url)) { - $urlSegment = ltrim($node->url, '/'); - $currentPath = $currentPath === '' - ? $urlSegment - : "{$currentPath}/{$urlSegment}"; - } - - // —— 递归构建子节点 —— - // 这里只会继续收目录和菜单，permission 永远不会进入此方法 - $children = $this->buildTree($resources, $node->id, $currentPath); - - // —— 本级权限列表 —— - $authList = $resources - ->filter(fn($r) => $r->type === 'permission' && $r->parent_id === $node->id) - ->map(fn($r) => [ - 'id' => $r->id, - 'title' => $r->name, - 'auth_mark' => $r->code, - ]) - ->values() - ->all(); - - // —— 判断是否有子目录或子菜单 —— - $hasChildrenMenu = ! empty($children); - - // —— 计算 component 字段 —— - if ($hasChildrenMenu) { - if ($node->type === 'menu' && !empty($node->url)) { - // menu 类型且自身有 url，用自身 url（加前导 slash） - $componentValue = '/' . ltrim($node->url, '/'); - } else { - // 其它含子项的节点，固定 Layout 组件 - $componentValue = '/index/index'; - } - } else { - // 叶子节点：拼接路径，确保以 slash 开头 - $componentValue = $currentPath !== '' - ? '/' . ltrim($currentPath, '/') - : ''; - } - - $tree[] = [ - 'id' => $node->id, - 'name' => $node->name, - 'path' => $node->url, - 'component' => $componentValue, - 'meta' => [ - 'title' => $node->name, - 'icon' => $node->icon, - 'keepAlive' => true, - 'authList' => $authList, - 'openType' => $node->open_type, - 'isHide' => $node->is_hide == 0 ? false : true, - 'isHideTab' => $node->is_hide_tab == 0 ? false : true - ], - 'children' => $children - ]; - } - - return $tree; - } - public function buildTree_bak2($resources, int $parentId = 0, string $parentPath = ''): array - { - $tree = []; - - foreach ($resources as $node) { - if ($node->parent_id !== $parentId) { - continue; - } - - // —— 拼接当前节点的完整路径 —— - $currentPath = $parentPath; - // 去掉末尾多余 slash - $currentPath = rtrim($currentPath, '/'); - - if (!empty($node->url)) { - // 如果当前节点有 url，则拼接 - $urlSegment = ltrim($node->url, '/'); - $currentPath = $currentPath === '' - ? $urlSegment - : "{$currentPath}/{$urlSegment}"; - } - - // —— 递归构建子节点 —— - $children = []; - if ($node->type === 'directory') { - $children = $this->buildTree($resources, $node->id, $currentPath); - } - - // —— 收集本级的 permission 权限列表 —— - $authList = $resources - ->filter(fn($r) => $r->type === 'permission' && $r->parent_id === $node->id) - ->map(fn($r) => [ - 'id' => $r->id, - 'title' => $r->name, - 'auth_mark' => $r->code, - ]) - ->values() - ->all(); - - // —— 判断是否有子菜单/目录 —— - $hasChildrenMenu = $resources - ->where('parent_id', $node->id) - ->whereIn('type', ['directory', 'menu']) - ->isNotEmpty(); - - // —— 计算 component 字段 —— - if ($hasChildrenMenu) { - // 只要有子项，就一律显示顶层 Layout 组件 - $componentValue = '/index/index'; - } else { - // 叶子节点：如果定义了 url，就使用拼接后的路径；否则用占位符（这里用空串，你可替换） - $componentValue = $currentPath !== '' ? $currentPath : ''; - } - - $tree[] = [ - 'id' => $node->id, - 'name' => $node->name, - 'path' => $node->url, - 'component' => $componentValue, - 'meta' => [ - 'title' => $node->name, - 'icon' => $node->icon, - 'keepAlive' => true, - 'authList' => $authList, - 'openType' => $node->open_type, - ], - 'children' => $children, - ]; - } - - return $tree; - } public function buildTree($resources, int $parentId = 0, string $parentPath = ''): array { $tree = []; @@ -258,7 +112,7 @@ class PermLogic 'meta' => [ 'title' => $node->name, 'icon' => $node->icon, - 'keepAlive' => true, + 'keepAlive' => $node->keep_alive == 1 ? true : false, 'authList' => $authList, 'openType' => $node->open_type, 'isHide' => $node->is_hide == 0 ? false : true, diff --git a/app/common/logic/ResourceLogic.php b/app/common/logic/ResourceLogic.php new file mode 100644 index 0000000..cbcb14e --- /dev/null +++ b/app/common/logic/ResourceLogic.php @@ -0,0 +1,17 @@ +hasOne(Corp::class, 'id', 'corp_id'); + } + + public function systemInfo() + { + return $this->hasOne(Systems::class, 'id', 'system_id'); + } +} \ No newline at end of file diff --git a/app/common/model/InquiryLog.php b/app/common/model/InquiryLog.php index 68926aa..798b267 100644 --- a/app/common/model/InquiryLog.php +++ b/app/common/model/InquiryLog.php @@ -62,7 +62,7 @@ class InquiryLog extends Model public function recipientInfo() { - return $this->hasOne(User::class, 'id', 'recipient'); + return $this->hasOne(User::class, 'id', 'recipient')->where('status', 1); } public function channelInfo() diff --git a/app/common/model/Resource.php b/app/common/model/Resource.php index 6fc54d9..bff7b0a 100644 --- a/app/common/model/Resource.php +++ b/app/common/model/Resource.php @@ -4,20 +4,6 @@ namespace app\common\model; use support\Model; -/** - * resources 资源表：目录/菜单/权限 - * @property integer $id 资源ID(主键) - * @property string $name 资源名称 - * @property string $type 资源类型 - * @property string $code 资源编码（权限标识） - * @property integer $parent_id 父资源ID - * @property string $url 路由 path 或 外链 URL - * @property string $icon 图标，仅目录/菜单有效 - * @property string $open_type 菜单打开方式 - * @property integer $sort 排序 - * @property string $created_at - * @property string $updated_at - */ class Resource extends Model { /** @@ -49,32 +35,15 @@ class Resource extends Model public $timestamps = true; - // 所属系统 - public function system() - { - return $this->belongsTo(Systems::class, 'system_id', 'id'); - } + protected $dateFormat = 'U'; - // 拥有该资源的角色 - public function roles() - { - return $this->belongsToMany(Role::class, 'role_resources', 'resource_id', 'role_id'); - } + /** + * 允许自动填充模型字段 + */ + protected $fillable = ['id', 'system_id', 'name', 'desc', 'type', 'code', 'parent_id', 'url', 'icon', 'open_type', 'is_hide', 'is_hide_tab', 'no_auth', 'is_home', 'instance', 'sort', 'status', 'created_at', 'updated_at']; - // 拥有该资源的用户（特殊补权） - public function users() - { - return $this->belongsToMany(User::class, 'user_resources', 'resource_id', 'user_id'); - } - - // 递归 - public function parent() - { - return $this->belongsTo(self::class, 'parent_id'); - } - - public function children() - { - return $this->hasMany(self::class, 'parent_id'); - } -} + /** + * 不允许自动填充模型字段 + */ + protected $guarded = []; +} \ No newline at end of file diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index dce3bb1..7d52eff 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -2,82 +2,93 @@ namespace app\common\service; -use app\model\User; -use app\model\Role; -use app\model\Resource; +use app\common\validate\ResourceValidate; +use app\common\traits\crud\CrudServiceTrait; +use app\common\model\Resource; +use app\common\utils\Tree; +use support\Request; class ResourceService { - /** - * 获取用户可见菜单树 - */ - public static function getMenuTreeForUser($userId) - { - $menuList = self::getUserMenus($userId); - // 转树 - return self::buildTree($menuList); - } + + use CrudServiceTrait; /** - * 获取用户所有有权限的菜单资源（type=menu） + * 指定当前要操作的模型 */ - public static function getUserMenus($userId) - { - $user = User::with('roles.resources')->find($userId); - if (!$user) return []; - // 合并所有角色下的菜单资源 - $allMenus = []; - foreach ($user->roles as $role) { - foreach ($role->resources as $res) { - if ($res->type === 'menu') { - $allMenus[$res->id] = $res; - } - } - } - return array_values($allMenus); // 去重后返回 - } + protected string $modelClass = Resource::class; /** - * 获取用户所有有权限的按钮/功能权限 code + * 验证器 */ - public static function getButtonPermissionCodesForUser($userId) - { - $user = User::with('roles.resources')->find($userId); - if (!$user) return []; - $codes = []; - foreach ($user->roles as $role) { - foreach ($role->resources as $res) { - if ($res->type === 'button' && $res->code) { - $codes[$res->code] = true; - } - } - } - return array_keys($codes); // 去重后返回权限code数组 - } + protected $validator = ResourceValidate::class; /** - * 递归构建菜单树 - * @param Resource[] $list - * @param int $parentId - * @return array + * 获取验证器 */ - protected static function buildTree($list, $parentId = 0) + public function getValidator() { - $tree = []; - foreach ($list as $item) { - if ($item->parent_id == $parentId) { - $children = self::buildTree($list, $item->id); - $arr = [ - 'id' => $item->id, - 'name' => $item->name, - 'path' => $item->url, - 'icon' => $item->icon ?? null, - 'code' => $item->code, - 'children' => $children, - ]; - $tree[] = $arr; - } + return new $this->validator; + } + + + protected function buildQueryConfig(Request $request, string $scene = 'default'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'default': + $config['where']['status'] = 1; + $config['order']['sort'] = 'asc'; + $config['order']['id'] = 'asc'; + break; + case 'menuList': + $config['where']['status'] = 1; + $config['where']['type'] = ['!=', 'permission']; + $config['order']['sort'] = 'asc'; + $config['order']['id'] = 'asc'; + break; + case 'index': + $config['where']['status'] = 1; + $config['order']['sort'] = 'asc'; + $config['order']['id'] = 'asc'; + break; + case 'show': + $config['where']['id'] = $p['id']; + $config['where']['status'] = 1; + break; + case 'store': + break; + case 'update': + $config['where']['id'] = $p['id']; + break; + case 'destroy': + $config['where']['id'] = $p['id']; + break; } - return $tree; + + return $config; + } + + public function serviceMenuList(Request $request) + { + $config = $this->buildQueryConfig($request, 'menuList'); + $result = $this->logicListAll($config); + return $this->postProcess('MenuList', $result); + } + + + protected function afterServiceListAll($data) + { + $data = Tree::buildWithAuthListAndReference($data->toArray()); + return $data; + } + + protected function afterServiceMenuList($data) + { + $data = Tree::buildWithReference($data->toArray()); + return $data; } } \ No newline at end of file diff --git a/app/common/traits/crud/CrudControllerTrait.php b/app/common/traits/crud/CrudControllerTrait.php index ca30ba3..5960d77 100644 --- a/app/common/traits/crud/CrudControllerTrait.php +++ b/app/common/traits/crud/CrudControllerTrait.php @@ -62,6 +62,7 @@ trait CrudControllerTrait $res = $this->service->serviceStore($request, $data); return $this->success($res, '创建成功'); } catch (\Throwable $e) { + dpr($e); return $this->error($e->getMessage()); } } diff --git a/app/common/traits/crud/CrudServiceTrait.php b/app/common/traits/crud/CrudServiceTrait.php index 344756d..dd4536f 100644 --- a/app/common/traits/crud/CrudServiceTrait.php +++ b/app/common/traits/crud/CrudServiceTrait.php @@ -1,6 +1,7 @@ buildQueryConfig($request, 'default'); $result = $this->logicListAll($config); } - return $this->postProcess('List', $result); + return $this->postProcess('ListAll', $result); } /** 查看单条 */ @@ -188,6 +189,6 @@ trait CrudServiceTrait */ // protected function complexQuery(array $params): array // { - // throw new \LogicException('请在子类实现 complexQuery'); + // throw new BusinessException('请在子类实现 complexQuery'); // } } \ No newline at end of file diff --git a/app/common/utils/Tree.php b/app/common/utils/Tree.php new file mode 100644 index 0000000..6322e36 --- /dev/null +++ b/app/common/utils/Tree.php @@ -0,0 +1,320 @@ + $item) { + if ($item[$pidField] == 0) { + $tree[] = &$items[$id]; + } else { + if (isset($items[$item[$pidField]])) { + $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; + + if (!isset($items[$item[$pidField]]['children'])) { + $items[$item[$pidField]]['children'] = []; + } + + $items[$item[$pidField]]['children'][] = &$items[$id]; + } + } + } + + return $tree; + } + + /** + * 将树形结构扁平化为列表（带层级前缀） + * + * @param array $tree 树形结构数据 + * @param string $prefix 前缀字符 + * @param string $field 显示字段名 + * @param int $level 层级 + * @return array + */ + public static function flattenWithPrefix(array $tree, string $prefix = '--', string $field = 'name', int $level = 0): array + { + $result = []; + + foreach ($tree as $item) { + $item[$field . '_with_prefix'] = str_repeat($prefix, $item['level']) . $item[$field]; + $result[] = $item; + + if (isset($item['children']) && !empty($item['children'])) { + $children = static::flattenWithPrefix($item['children'], $prefix, $field, $item['level'] + 1); + $result = array_merge($result, $children); + } + } + + return $result; + } + + /** + * 根据父ID查找所有子节点（包括子孙节点） + * + * @param array $data 数据列表 + * @param int $parentId 父级ID + * @param string $pidField 父级字段名 + * @param string $idField ID字段名 + * @return array + */ + public static function findChildren(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array + { + $children = []; + + foreach ($data as $item) { + if ($item[$pidField] == $parentId) { + $children[] = $item; + $grandChildren = static::findChildren($data, $item[$idField], $pidField, $idField); + $children = array_merge($children, $grandChildren); + } + } + + return $children; + } + + /** + * 获取指定节点的所有父级节点 + * + * @param array $data 数据列表 + * @param int $id 当前节点ID + * @param string $pidField 父级字段名 + * @param string $idField ID字段名 + * @return array + */ + public static function getParents(array $data, int $id, string $pidField = 'parent_id', string $idField = 'id'): array + { + $parents = []; + + foreach ($data as $item) { + if ($item[$idField] == $id) { + if ($item[$pidField] != 0) { + $parents[] = $item; + $parentParents = static::getParents($data, $item[$pidField], $pidField, $idField); + $parents = array_merge($parents, $parentParents); + } + break; + } + } + + return $parents; + } + + /** + * 获取指定节点的子孙节点ID列表 + * + * @param array $data 数据列表 + * @param int $parentId 父级ID + * @param string $pidField 父级字段名 + * @param string $idField ID字段名 + * @return array + */ + public static function getChildrenIds(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array + { + $ids = []; + $children = static::findChildren($data, $parentId, $pidField, $idField); + + foreach ($children as $child) { + $ids[] = $child[$idField]; + } + + return $ids; + } + + /** + * 检查是否有子节点 + * + * @param array $data 数据列表 + * @param int $parentId 父级ID + * @param string $pidField 父级字段名 + * @return bool + */ + public static function hasChildren(array $data, int $parentId, string $pidField = 'parent_id'): bool + { + foreach ($data as $item) { + if ($item[$pidField] == $parentId) { + return true; + } + } + + return false; + } + + + /** + * 构建带有权限列表的资源树（权限不显示在树结构中） + * + * @param array $data 资源数据列表 + * @param int $parentId 父级ID + * @param string $pidField 父级字段名 + * @param string $idField ID字段名 + * @param string $typeField 类型字段名 + * @param string $permissionType 权限类型标识 + * @param int $level 当前层级 + * @return array + */ + public static function buildWithAuthList( + array $data, + int $parentId = 0, + string $pidField = 'parent_id', + string $idField = 'id', + string $typeField = 'type', + string $permissionType = 'permission', + int $level = 0 + ): array { + $tree = []; + + foreach ($data as $item) { + // 只处理指定父级的非权限节点 + if ($item[$pidField] == $parentId && $item[$typeField] != $permissionType) { + $item['level'] = $level; + + // 递归处理子节点（非权限类型） + $children = static::buildWithAuthList($data, $item[$idField], $pidField, $idField, $typeField, $permissionType, $level + 1); + + if (!empty($children)) { + $item['children'] = $children; + } + + // 收集当前节点下的所有权限 + $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); + + $tree[] = $item; + } + } + + return $tree; + } + + /** + * 收集指定节点下的直接权限项（只收集直接子节点中的权限） + * + * @param array $data 数据列表 + * @param int $parentId 父级ID + * @param string $pidField 父级字段名 + * @param string $typeField 类型字段名 + * @param string $permissionType 权限类型标识 + * @return array + */ + public static function collectDirectPermissions( + array $data, + int $parentId, + string $pidField = 'parent_id', + string $typeField = 'type', + string $permissionType = 'permission' + ): array { + $permissions = []; + + foreach ($data as $item) { + // 收集直接子节点中的权限类型 + if ($item[$pidField] == $parentId && $item[$typeField] == $permissionType) { + $permissions[] = $item; + } + } + + return $permissions; + } + + /** + * 使用引用方式构建带有权限列表的资源树（权限不显示在树结构中） + * + * @param array $data 资源数据列表 + * @param string $pidField 父级字段名 + * @param string $idField ID字段名 + * @param string $typeField 类型字段名 + * @param string $permissionType 权限类型标识 + * @return array + */ + public static function buildWithAuthListAndReference( + array $data, + string $pidField = 'parent_id', + string $idField = 'id', + string $typeField = 'type', + string $permissionType = 'permission' + ): array { + $items = []; + $tree = []; + + // 建立以id为索引的数组（只包含非权限节点） + foreach ($data as $item) { + if ($item[$typeField] != $permissionType) { + $item['level'] = 0; + $items[$item[$idField]] = $item; + } + } + + // 构建树形结构 + foreach ($items as $id => $item) { + if ($item[$pidField] == 0) { + $tree[] = &$items[$id]; + } else { + if (isset($items[$item[$pidField]])) { + $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; + + if (!isset($items[$item[$pidField]]['children'])) { + $items[$item[$pidField]]['children'] = []; + } + + $items[$item[$pidField]]['children'][] = &$items[$id]; + } + } + } + + // 为每个节点添加权限列表 + foreach ($items as &$item) { + $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); + } + + return $tree; + } +} \ No newline at end of file diff --git a/app/common/validate/CorpFeishuAppValidate.php b/app/common/validate/CorpFeishuAppValidate.php new file mode 100644 index 0000000..d055d65 --- /dev/null +++ b/app/common/validate/CorpFeishuAppValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/common/validate/CountryValidate.php b/app/common/validate/CountryValidate.php new file mode 100644 index 0000000..d2a413b --- /dev/null +++ b/app/common/validate/CountryValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/common/validate/ResourceValidate.php b/app/common/validate/ResourceValidate.php new file mode 100644 index 0000000..ea2646e --- /dev/null +++ b/app/common/validate/ResourceValidate.php @@ -0,0 +1,29 @@ + [ + + ], + + 'update' => [ + + ] + ]; +} \ No newline at end of file diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index 77c5622..6cd6d6a 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -75,27 +75,27 @@ class IndexController public function createResource() { $options = [ - // 'controller' => [ - // 'module' => 'inquiry', - // 'name' => 'country' - // ], + 'controller' => [ + 'module' => 'common', + 'name' => 'resources' + ], 'model' => [ 'module' => 'common', - 'name' => 'email_parsed_result' + 'name' => 'resources' ], - // 'service' => [ - // 'module' => 'inquiry', - // 'name' => 'country' - // ], - // 'logic' => [ - // 'module' => 'inquiry', - // 'name' => 'country' - // ], - // 'validate' => [ - // 'module' => 'inquiry', - // 'name' => 'country' - // ], - 'table' => 'email_parsed_result' + 'service' => [ + 'module' => 'common', + 'name' => 'resources' + ], + 'logic' => [ + 'module' => 'common', + 'name' => 'resources' + ], + 'validate' => [ + 'module' => 'common', + 'name' => 'resources' + ], + 'table' => 'resources' ]; $result = (new Generate($options))->doGenerate(); diff --git a/app/inquiry/controller/StatisticsController.php b/app/inquiry/controller/StatisticsController.php index 0e37719..8412715 100644 --- a/app/inquiry/controller/StatisticsController.php +++ b/app/inquiry/controller/StatisticsController.php @@ -101,7 +101,7 @@ class StatisticsController extends BaseController { $list = InquiryLog::with(["recipientInfo"]) ->where("recipient", ">", 0) - ->whereNotIn('recipient', [1,5,10,11,13,15,16,17,19,74,75,78,141,147]) + ->whereNotIn('recipient', [1,5,10,11,13,155,16,17,19,74,75,78,141,147]) ->select('recipient', Db::raw('COUNT(*) as totals')) ->groupBy('recipient') ->get(); diff --git a/config/route.php b/config/route.php index 7ad0f19..5e1afa6 100644 --- a/config/route.php +++ b/config/route.php @@ -72,13 +72,6 @@ Route::group('/admin', function () { Route::any('/destroy', [app\admin\controller\RoleController::class, 'destroy']); }); - // 用户 - Route::group('/user', function () { - Route::any('/list', [app\admin\controller\UserController::class, 'index']); - Route::any('/show', [app\admin\controller\UserController::class, 'show']); - Route::any('/update', [app\admin\controller\UserController::class, 'update']); - }); - // 公司 Route::group('/corp', function () { Route::any('/list', [app\admin\controller\CorpController::class, 'index']); @@ -88,6 +81,41 @@ Route::group('/admin', function () { Route::any('/destroy', [app\admin\controller\CorpController::class, 'destroy']); }); + // 系统 + Route::group('/systems', function () { + Route::any('/list', [app\admin\controller\SystemsController::class, 'index']); + Route::any('/show', [app\admin\controller\SystemsController::class, 'show']); + Route::any('/store', [app\admin\controller\SystemsController::class, 'store']); + Route::any('/update', [app\admin\controller\SystemsController::class, 'update']); + Route::any('/destroy', [app\admin\controller\SystemsController::class, 'destroy']); + }); + + // 飞书应用 + Route::group('/corp/feishu', function () { + Route::any('/list', [app\admin\controller\CorpFeishuAppController::class, 'index']); + Route::any('/show', [app\admin\controller\CorpFeishuAppController::class, 'show']); + Route::any('/store', [app\admin\controller\CorpFeishuAppController::class, 'store']); + Route::any('/update', [app\admin\controller\CorpFeishuAppController::class, 'update']); + Route::any('/destroy', [app\admin\controller\CorpFeishuAppController::class, 'destroy']); + }); + + // 资源 + Route::group('/resources', function () { + Route::any('/list/tree', [app\common\controller\ResourceController::class, 'listTree']); + Route::any('/show', [app\common\controller\ResourceController::class, 'show']); + Route::any('/store', [app\common\controller\ResourceController::class, 'store']); + Route::any('/update', [app\common\controller\ResourceController::class, 'update']); + Route::any('/destroy', [app\common\controller\ResourceController::class, 'destroy']); + Route::any('/list/menu', [app\common\controller\ResourceController::class, 'menuList']); + }); + + // 用户 + Route::group('/user', function () { + Route::any('/list', [app\admin\controller\UserController::class, 'index']); + Route::any('/show', [app\admin\controller\UserController::class, 'show']); + Route::any('/update', [app\admin\controller\UserController::class, 'update']); + }); + // 询单 Route::group('/inquiry', function () { Route::any('/list', [app\inquiry\controller\InquiryLogController::class, 'index']); From 9c19cca671065bd11c6fa752f43c94197bf9be23 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Tue, 12 Aug 2025 13:53:48 +0800 Subject: [PATCH 02/48] =?UTF-8?q?=E7=BB=84=E5=91=98=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/UserController.php | 49 ++++++++++++++++ app/common/logic/UserLogic.php | 8 +++ app/common/model/User.php | 4 +- app/common/service/UserService.php | 68 +++++++++++++++++++++++ app/crm/controller/CustomerController.php | 45 +++++++++++++++ config/route.php | 3 + 6 files changed, 176 insertions(+), 1 deletion(-) diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index d725166..bf14859 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -2,12 +2,61 @@ namespace app\common\controller; +use app\common\traits\crud\CrudControllerTrait; use support\Request; use app\common\service\UserService; class UserController extends BaseController { + use CrudControllerTrait; + + protected $service; + + public function __construct() + { + $this->service = new UserService(); + } + + /** + * 获取组员列表 + * + * @param Request $request 请求对象 + * @return mixed 返回分页数据及总数 + */ + public function team(Request $request) + { + try { + $raw = $this->service->serviceTeam($request); + $data = $this->transformData($raw, method_exists($this, 'indexFormat') + ? [$this, 'indexFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + /** + * 标记组员离职 + * + * @param Request $request 请求对象 + * @return mixed 返回分页数据及总数 + */ + public function resignMember(Request $request) + { + try { + $userId = $request->post('user_id'); + if(empty($userId)){ + return $this->error('组员id不能为空'); + } + $user = $this->service->resignMember($request); + return $this->success($user, '获取用户信息'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + /** * 用户信息 */ diff --git a/app/common/logic/UserLogic.php b/app/common/logic/UserLogic.php index 9f5ae44..c7d5343 100644 --- a/app/common/logic/UserLogic.php +++ b/app/common/logic/UserLogic.php @@ -3,10 +3,18 @@ namespace app\common\logic; use app\common\model\User; +use app\common\traits\crud\CrudLogicTrait; use support\exception\BusinessException; class UserLogic { + use CrudLogicTrait; + + /** + * 指定当前要操作的模型 + */ + protected string $modelClass = User::class; + /** * 用户信息 */ diff --git a/app/common/model/User.php b/app/common/model/User.php index 446ed46..88c670d 100644 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -15,7 +15,8 @@ use support\Model; * @property string $email 邮箱 * @property integer $status 状态 * @property string $system_code 系统码 - * @property string $created_at + * @property string $report_to 上级用户ID + * @property string $created_at * @property string $updated_at */ class User extends Model @@ -69,6 +70,7 @@ class User extends Model 'position', 'socialize', 'socialize_pic', + 'report_to', ]; // 用户所有角色 diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 1d5dab4..bfcf345 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -5,12 +5,21 @@ namespace app\common\service; use app\common\logic\UserLogic; use app\common\model\Corp; use app\common\model\User; +use app\common\traits\crud\CrudLogicTrait; +use app\common\traits\crud\CrudServiceTrait; use app\common\utils\CrudUtil; use app\crm\model\Country; use support\exception\BusinessException; +use support\Request; class UserService { + use CrudServiceTrait; + + /** + * 指定当前要操作的模型 + */ + protected string $modelClass = User::class; protected $logic; @@ -110,4 +119,63 @@ class UserService { return $this->logic->getList(); } + + /** 分页列表 */ + public function serviceTeam(Request $request) + { + if (method_exists($this, 'complexQuery')) { + $result = $this->complexQuery($request->get()); + } else { + $config = $this->buildQueryConfig($request, 'team'); + $limit = (int)$request->get('size', 15); + $page = (int)$request->get('current', 1); + $result = $this->logicList($config, $limit, $page); + } + return $this->postProcess('List', $result); + } + + /** 分页列表 */ + public function resignMember(Request $request) + { + $uid = $request->user->uid; + $userId = $request->post('user_id'); + $user = User::find($userId); + if ($user->report_to != $uid) { + throw new BusinessException('禁止操作非组员'); + } + + $data = [ + 'status' => 2, + ]; + $user = $this->logic->edit($userId,$data); + $user = $user->toArray(); + unset($user['password']); + unset($user['open_id']); + unset($user['tenant_key']); + unset($user['union_id']); + return $user; + } + + /** + * 构造 CrudUtil 查询配置 + */ + protected function buildQueryConfig(Request $request, string $scene = 'default'): array + { + $p = $request->all(); + + $config = []; + $config['model'] = $this->modelClass; + switch ($scene) { + case 'team': +// $config['where']['status'] = 1; // 关键字 + $config['order']['id'] = 'desc'; + + $config['dataLimit']['type'] = 'relation'; + $config['dataLimit']['userId'] = $request->user->uid; + $config['dataLimit']['userField'] = 'report_to'; + break; + } + + return $config; + } } \ No newline at end of file diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index d1e7cdb..8b141a2 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -526,6 +526,51 @@ class CustomerController extends BaseController } } + /** + * 客户转移至公海 + * @param Request $request + * @return \support\Response + */ + public function putSeas(Request $request) + { + $customerId = Util::getParam($request, 'customer_id'); + $userId = $request->user->uid; + if (Util::isEmpty($customerId)) { + return $this->error(trans('customer_id').trans('not_null')); + } + + try { + Db::beginTransaction(); + $customer= Customer::withTrashed()->where('user_id',$userId)->find($customerId); + + if(empty($customer)){ + return $this->error( 'customer_id错误'); + } + $data = [ + 'user_id' => 0, + ]; + + $res = $customer->update($data); + + //记录客户关系变化 + $his = CustomerHis::create([ + 'customer_id' => $customerId, + 'user_his' => $userId, + 'user_id' => 0, + ]); + Db::commit(); + } catch (\Throwable $e) { + Db::rollback(); + return $this->error($e->getMessage()); + } + + if ($res) { + return $this->success($res, trans('success')); + } else { + return $this->error(trans('fail')); + } + } + /** diff --git a/config/route.php b/config/route.php index 0c928eb..44bbe64 100644 --- a/config/route.php +++ b/config/route.php @@ -52,6 +52,8 @@ Route::group('/common', function () { Route::group('/user', function () { Route::any('/info', [app\common\controller\UserController::class, 'info']); Route::any('/get', [app\common\controller\UserController::class, 'getUser']); + Route::any('/team', [app\common\controller\UserController::class, 'team']); + Route::any('/resign', [app\common\controller\UserController::class, 'resignMember']); }); Route::group('/preset', function () { @@ -170,6 +172,7 @@ Route::group('/crm', function () { Route::any('/customer/getCountry', [app\crm\controller\CustomerController::class, 'getCountry']); Route::any('/customer/followNext', [app\crm\controller\CustomerController::class, 'followNext']); Route::any('/customer/report', [app\crm\controller\CustomerController::class, 'report']); + Route::any('/customer/seas', [app\crm\controller\CustomerController::class, 'putSeas']); Route::any('/tagGroup/list', [app\crm\controller\TagGroupController::class, 'list']); Route::any('/tagGroup/updatePivot', [app\crm\controller\TagGroupController::class, 'updatePivot']); From 360aeec0e1ba95011b73af19059ec0ba23a0c10d Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Tue, 12 Aug 2025 15:26:17 +0800 Subject: [PATCH 03/48] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/RoleController.php | 99 +++--------------- app/admin/controller/UserController.php | 87 +++++++++++----- app/admin/logic/UserLogic.php | 80 +++++++++++++++ app/admin/service/RoleService.php | 10 ++ app/admin/service/UserService.php | 25 +++++ app/common/controller/ResourceController.php | 16 +++ app/common/controller/UserController.php | 100 +++++++++---------- app/common/logic/ResourceLogic.php | 20 ++++ app/common/logic/RoleLogic.php | 79 ++++++++++++++- app/common/service/ResourceService.php | 19 ++++ config/route.php | 4 + 11 files changed, 372 insertions(+), 167 deletions(-) diff --git a/app/admin/controller/RoleController.php b/app/admin/controller/RoleController.php index 691e070..f73f07d 100644 --- a/app/admin/controller/RoleController.php +++ b/app/admin/controller/RoleController.php @@ -5,6 +5,7 @@ namespace app\admin\controller; use app\common\controller\BaseController; use app\admin\service\RoleService; use app\common\traits\crud\CrudControllerTrait; +use support\Request; class RoleController extends BaseController { @@ -27,91 +28,15 @@ class RoleController extends BaseController return $data; } - // /** - // * 获取角色列表 - // */ - // public function list(Request $request) - // { - // try { - // $params = $request->all(); - // $result = (new RoleService())->getRoleList($params); - // // 定义后处理器 - // $postProcessor = function($formattedData) { - // if (isset($formattedData['created_at'])) - // $formattedData['created_at'] = date('Y-m-d H:i:s', $formattedData['created_at']); - // if (isset($formattedData['updated_at'])) - // $formattedData['updated_at'] = date('Y-m-d H:i:s', $formattedData['updated_at']); - // return $formattedData; - // }; - // return $this->success($this->transformData($result, $postProcessor), '角色列表获取成功'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } - // /** - // * 获取角色详情 - // */ - // public function detail(Request $request) - // { - // try { - // $roleId = $request->get('role_id'); - // if (!$roleId) { - // return $this->error('缺少角色ID', 422); - // } - // $result = (new RoleService())->getRoleDetail($roleId); - // return $this->success($result, '角色详情获取成功'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } - - // /** - // * 增加角色 - // */ - // public function create(Request $request) - // { - // try { - // $data = $this->validate(new RoleValidate(), $request->post(), 'role_create'); - // $result = (new RoleService())->createRole($data); - // return $this->success($result, '角色创建成功'); - // } catch (\think\exception\ValidateException $e) { - // return $this->error($e->getError(), 422); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } - - // /** - // * 修改角色 - // */ - // public function update(Request $request) - // { - // try { - // $data = $this->validate(new RoleValidate(), $request->post(), 'role_update'); - // $result = (new RoleService())->updateRole($data); - // return $this->success($result, '角色更新成功'); - // } catch (\think\exception\ValidateException $e) { - // return $this->error($e->getError(), 422); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } - - // /** - // * 删除角色 - // */ - // public function delete(Request $request) - // { - // try { - // $roleId = $request->get('role_id'); - // if (!$roleId) { - // return $this->error('缺少角色ID', 422); - // } - // (new RoleService())->deleteRole($roleId); - // return $this->success([], '角色删除成功'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } -} + public function menuResource(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'allocation'); + $res = $this->service->menuResource($request, $data); + return $this->success($res); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } +} \ No newline at end of file diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index dfcebd7..ae596e3 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -6,6 +6,7 @@ use app\common\model\Corp; use app\common\traits\crud\CrudControllerTrait; use app\admin\service\UserService; use app\crm\model\Customer; +use support\Request; class UserController extends BaseController { @@ -24,32 +25,66 @@ class UserController extends BaseController * @param array $data * @return array */ - protected function indexFormat($data) - { - if(isset($data['records'])){ - return $data; - } - $data['sex_txt'] = ''; - if (isset($data['sex']) && $data['sex'] == 1){ - $data['sex_txt'] = '男'; - }elseif(isset($data['sex']) && $data['sex'] == 2){ - $data['sex_txt'] = '女'; - } + protected function indexFormat($data) + { + if(isset($data['records'])){ + return $data; + } + $data['sex_txt'] = ''; + if (isset($data['sex']) && $data['sex'] == 1){ + $data['sex_txt'] = '男'; + }elseif(isset($data['sex']) && $data['sex'] == 2){ + $data['sex_txt'] = '女'; + } - switch ($data['status']){ - case 1: - $data['status_txt'] = '正常'; - break; - case 2: - $data['status_txt'] = '离职'; - break; - default: - $data['status_txt'] = ''; - break; - } + switch ($data['status']){ + case 1: + $data['status_txt'] = '正常'; + break; + case 2: + $data['status_txt'] = '离职'; + break; + default: + $data['status_txt'] = ''; + break; + } - $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name'); - $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); - return $data; - } + $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name'); + $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); + return $data; + } + + /** + * 授权 + * + * @param Request $request + * @return mixed + */ + public function authorize(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'authorize'); + $res = $this->service->authorize($request, $data); + return $this->success([], '分配成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + /** + * 直接授权 + * + * @param Request $request + * @return mixed + */ + public function updateResources(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'updateResources'); + $res = $this->service->updateResources($request, $data); + return $this->success([], '分配成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/admin/logic/UserLogic.php b/app/admin/logic/UserLogic.php index de0d15d..2df041d 100644 --- a/app/admin/logic/UserLogic.php +++ b/app/admin/logic/UserLogic.php @@ -4,6 +4,7 @@ namespace app\admin\logic; use app\common\traits\crud\CrudLogicTrait; use app\common\model\User; +use support\Db; class UserLogic { @@ -14,4 +15,83 @@ class UserLogic */ protected string $modelClass = User::class; + + public function updateRoleAndSystem(array $data): bool + { + $roleIds = $data['role_ids'] ?? []; + $systemIds = $data['system_ids'] ?? []; + $userId = $data['user_id'] ?? 0; + + if (empty($roleId)) { + return false; + } + + Db::beginTransaction(); + try { + Db::table('user_roles')->where('user_id', $userId)->delete(); + if (!empty($roleIds)) { + $insertData = []; + foreach ($roleIds as $roleId) { + $insertData[] = [ + 'role_id' => $roleId, + 'user_id' => $userId + ]; + } + Db::table('user_roles')->insert($insertData); + } + + Db::table('user_systems')->where('user_id', $userId)->delete(); + if (!empty($systemIds)) { + $insertData = []; + foreach ($systemIds as $systemId) { + $insertData[] = [ + 'system_id' => $systemId, + 'user_id' => $userId + ]; + } + Db::table('user_systems')->insert($insertData); + } + + Db::commit(); + return true; + } catch (\Throwable $exception) { + Db::rollBack(); + return false; + } + } + + + public function updateUserResources(array $data): bool + { + $userId = $data['role_id'] ?? 0; + $resources = $data['resources'] ?? []; + + if (empty($userId)) { + return false; + } + + Db::beginTransaction(); + try { + // 删除原有资源关联 + Db::table('user_resources')->where('user_id', $userId)->delete(); + + // 批量插入新角色资源关联 + if (!empty($resources)) { + $insertData = []; + foreach ($resources as $resourceId) { + $insertData[] = [ + 'user_id' => $userId, + 'resource_id' => $resourceId + ]; + } + Db::table('user_resources')->insert($insertData); + } + + Db::commit(); + return true; + } catch (\Throwable $exception) { + Db::rollBack(); + return false; + } + } } \ No newline at end of file diff --git a/app/admin/service/RoleService.php b/app/admin/service/RoleService.php index 248bc3d..af86a04 100644 --- a/app/admin/service/RoleService.php +++ b/app/admin/service/RoleService.php @@ -2,9 +2,11 @@ namespace app\admin\service; +use app\common\logic\RoleLogic; use app\common\validate\RoleValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\Role; +use support\Db; class RoleService { @@ -28,4 +30,12 @@ class RoleService { return new $this->validator; } + + /** + * 获取角色资源 + */ + public function menuResource($request, $data) + { + return (new RoleLogic)->updateRoleResources($data); + } } \ No newline at end of file diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 6926bc5..4ce782a 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -2,6 +2,7 @@ namespace app\admin\service; +use app\admin\logic\UserLogic; use app\admin\validate\UserValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\User; @@ -75,4 +76,28 @@ class UserService return $config; } + + /** + * 授权 + * + * @param Request $request + * @param array $data + * @return bool + */ + public function authorize(Request $request, array $data = []) + { + return (new UserLogic())->updateRoleAndSystem($data); + } + + /** + * 更新用户资源权限 + * + * @param Request $request + * @param array $data + * @return bool + */ + public function updateResources(Request $request, array $data = []) + { + return (new UserLogic())->updateUserResources($data); + } } \ No newline at end of file diff --git a/app/common/controller/ResourceController.php b/app/common/controller/ResourceController.php index 4d81058..5fd35b9 100644 --- a/app/common/controller/ResourceController.php +++ b/app/common/controller/ResourceController.php @@ -63,4 +63,20 @@ class ResourceController extends BaseController return $this->error($e->getMessage()); } } + + /** + * 菜单 + */ + public function menuTreeList(Request $request) + { + try { + $raw = $this->service->serviceMenuTreeList($request); + $data = $this->transformData($raw, method_exists($this, 'allFormat') + ? [$this, 'allFormat'] + : null); + return $this->success($data); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index d725166..a69f32b 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -9,7 +9,7 @@ class UserController extends BaseController { /** - * 用户信息 + * 用户信息（登录后调用） */ public function info(Request $request) { @@ -23,57 +23,57 @@ class UserController extends BaseController } } - /** - * 用户信息 - */ - public function getUser(Request $request) - { - try { - $uid = $request->user->uid; - $corp_abbr = $request->basic_data['corp_abbr']; - $result = (new UserService())->getUser($uid,$corp_abbr); - return $this->success($result, '获取用户信息'); - } catch (\Throwable $e) { - return $this->error($e->getMessage()); - } - } + // /** + // * 用户信息 + // */ + // public function getUser(Request $request) + // { + // try { + // $uid = $request->user->uid; + // $corp_abbr = $request->basic_data['corp_abbr']; + // $result = (new UserService())->getUser($uid,$corp_abbr); + // return $this->success($result, '获取用户信息'); + // } catch (\Throwable $e) { + // return $this->error($e->getMessage()); + // } + // } - /** - * 编辑用户 - */ - public function edit(Request $request) - { - try { - $uid = $request->user->uid; - $data = $request->all(); - $result = (new UserService())->edit($uid,$data); - unset($result['password']); - unset($result['union_id']); - unset($result['open_id']); - unset($result['tenant_key']); - return $this->success($result, '编辑成功'); - } catch (\Throwable $e) { - return $this->error($e->getMessage()); - } - } + // /** + // * 编辑用户 + // */ + // public function edit(Request $request) + // { + // try { + // $uid = $request->user->uid; + // $data = $request->all(); + // $result = (new UserService())->edit($uid,$data); + // unset($result['password']); + // unset($result['union_id']); + // unset($result['open_id']); + // unset($result['tenant_key']); + // return $this->success($result, '编辑成功'); + // } catch (\Throwable $e) { + // return $this->error($e->getMessage()); + // } + // } - /** - * 修改密码 - * @param Request $request - * @return \support\Response - * @throws \Random\RandomException - */ - public function savePassword(Request $request) - { - try { - $uid = $request->user->uid; - $data = $request->all(); - $result = (new UserService())->savePassword($uid,$data);; - return $this->success($result, '编辑成功'); - } catch (\Throwable $e) { - return $this->error($e->getMessage()); - } - } + // /** + // * 修改密码 + // * @param Request $request + // * @return \support\Response + // * @throws \Random\RandomException + // */ + // public function savePassword(Request $request) + // { + // try { + // $uid = $request->user->uid; + // $data = $request->all(); + // $result = (new UserService())->savePassword($uid,$data);; + // return $this->success($result, '编辑成功'); + // } catch (\Throwable $e) { + // return $this->error($e->getMessage()); + // } + // } } \ No newline at end of file diff --git a/app/common/logic/ResourceLogic.php b/app/common/logic/ResourceLogic.php index cbcb14e..ddf6423 100644 --- a/app/common/logic/ResourceLogic.php +++ b/app/common/logic/ResourceLogic.php @@ -4,6 +4,7 @@ namespace app\common\logic; use app\common\traits\crud\CrudLogicTrait; use app\common\model\Resource; +use support\Request; class ResourceLogic { @@ -14,4 +15,23 @@ class ResourceLogic */ protected string $modelClass = Resource::class; + + public function logicListAllResources(Request $request, array $config) + { + $data = $this->logicListAll($config); + + if ($request->get('role_id')) { + $selected = (new RoleLogic())->getRoleResources($request->get('role_id')); + } else if ($request->get('user_id')) { + $selected = (new RoleLogic())->getUserResources($request->get('user_id')); + } else { + $selected = []; + } + + foreach ($data as &$item) { + $item['selected'] = in_array($item['id'], $selected) ? true : false; + } + + return $data; + } } \ No newline at end of file diff --git a/app/common/logic/RoleLogic.php b/app/common/logic/RoleLogic.php index bd8f121..0898b10 100644 --- a/app/common/logic/RoleLogic.php +++ b/app/common/logic/RoleLogic.php @@ -2,13 +2,84 @@ namespace app\common\logic; -use app\common\model\Role; -use support\exception\BusinessException; -use support\Log; +use support\Db; class RoleLogic { - + /** + * 更新角色资源权限 + * + * @param array $data 包含 role_id 和 resources 的数据 + * @return bool 操作是否成功 + */ + public function updateRoleResources(array $data): bool + { + $roleId = $data['role_id'] ?? 0; + $resources = $data['resources'] ?? []; + + if (empty($roleId)) { + return false; + } + + Db::beginTransaction(); + try { + // 删除原有角色资源关联 + Db::table('role_resources')->where('role_id', $roleId)->delete(); + + // 批量插入新角色资源关联 + if (!empty($resources)) { + $insertData = []; + foreach ($resources as $resourceId) { + $insertData[] = [ + 'role_id' => $roleId, + 'resource_id' => $resourceId + ]; + } + Db::table('role_resources')->insert($insertData); + } + + Db::commit(); + return true; + } catch (\Throwable $exception) { + Db::rollBack(); + return false; + } + } + /** + * 获取角色资源 + * + * @param int $roleId 角色ID + * @return array 资源ID列表 + */ + public function getRoleResources(int $roleId): array + { + if (empty($roleId)) { + return []; + } + + return Db::table('role_resources') + ->where('role_id', $roleId) + ->pluck('resource_id') + ->toArray(); + } + + /** + * 获取用户资源 + * + * @param int $userId 用户ID + * @return array 资源ID列表 + */ + public function getUserResources(int $userId): array + { + if (empty($userId)) { + return []; + } + + return Db::table('user_resources') + ->where('user_id', $userId) + ->pluck('resource_id') + ->toArray(); + } } diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index 7d52eff..5c73800 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -2,6 +2,7 @@ namespace app\common\service; +use app\common\logic\ResourceLogic; use app\common\validate\ResourceValidate; use app\common\traits\crud\CrudServiceTrait; use app\common\model\Resource; @@ -50,6 +51,11 @@ class ResourceService $config['order']['sort'] = 'asc'; $config['order']['id'] = 'asc'; break; + case 'menuTreeList': + $config['where']['status'] = 1; + $config['order']['sort'] = 'asc'; + $config['order']['id'] = 'asc'; + break; case 'index': $config['where']['status'] = 1; $config['order']['sort'] = 'asc'; @@ -79,6 +85,13 @@ class ResourceService return $this->postProcess('MenuList', $result); } + public function serviceMenuTreeList(Request $request) + { + $config = $this->buildQueryConfig($request, 'menuTreeList'); + $result = (new ResourceLogic())->logicListAllResources($request, $config); + return $this->postProcess('MenuTreeList', $result); + } + protected function afterServiceListAll($data) { @@ -91,4 +104,10 @@ class ResourceService $data = Tree::buildWithReference($data->toArray()); return $data; } + + protected function afterServiceMenuTreeList($data) + { + $data = Tree::buildWithReference($data->toArray()); + return $data; + } } \ No newline at end of file diff --git a/config/route.php b/config/route.php index 5e1afa6..880c4a5 100644 --- a/config/route.php +++ b/config/route.php @@ -70,6 +70,7 @@ Route::group('/admin', function () { Route::any('/store', [app\admin\controller\RoleController::class, 'store']); Route::any('/update', [app\admin\controller\RoleController::class, 'update']); Route::any('/destroy', [app\admin\controller\RoleController::class, 'destroy']); + Route::any('/menu/resource', [app\admin\controller\RoleController::class, 'menuResource']); }); // 公司 @@ -107,6 +108,7 @@ Route::group('/admin', function () { Route::any('/update', [app\common\controller\ResourceController::class, 'update']); Route::any('/destroy', [app\common\controller\ResourceController::class, 'destroy']); Route::any('/list/menu', [app\common\controller\ResourceController::class, 'menuList']); + Route::any('/list/menu/tree', [app\common\controller\ResourceController::class, 'menuTreeList']); }); // 用户 @@ -114,6 +116,8 @@ Route::group('/admin', function () { Route::any('/list', [app\admin\controller\UserController::class, 'index']); Route::any('/show', [app\admin\controller\UserController::class, 'show']); Route::any('/update', [app\admin\controller\UserController::class, 'update']); + Route::any('/authorize', [app\admin\controller\UserController::class, 'authorize']); + Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); }); // 询单 From 15c089e0aac68232f074fd0523c48e76ed2b6279 Mon Sep 17 00:00:00 2001 From: chenlan <18339827479@163.com> Date: Tue, 12 Aug 2025 19:03:37 +0800 Subject: [PATCH 04/48] ts --- app/admin/logic/UserLogic.php | 2 +- app/common/validate/RoleValidate.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/logic/UserLogic.php b/app/admin/logic/UserLogic.php index 2df041d..e01da99 100644 --- a/app/admin/logic/UserLogic.php +++ b/app/admin/logic/UserLogic.php @@ -63,7 +63,7 @@ class UserLogic public function updateUserResources(array $data): bool { - $userId = $data['role_id'] ?? 0; + $userId = $data['user_id'] ?? 0; $resources = $data['resources'] ?? []; if (empty($userId)) { diff --git a/app/common/validate/RoleValidate.php b/app/common/validate/RoleValidate.php index 372159f..6b2294e 100644 --- a/app/common/validate/RoleValidate.php +++ b/app/common/validate/RoleValidate.php @@ -26,7 +26,7 @@ class RoleValidate extends Validate ]; protected $scene = [ - 'store' => ['system_id', 'name', 'desc', 'sort'], + 'store' => ['name', 'desc', 'sort'], 'update' => ['id', 'system_id', 'name', 'desc', 'sort', 'status'], ]; } From c59758f03ce31124d452537b7048a752a791ba88 Mon Sep 17 00:00:00 2001 From: mzl Date: Wed, 13 Aug 2025 08:49:09 +0800 Subject: [PATCH 05/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/validate/RoleValidate.php | 2 +- config/route.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/common/validate/RoleValidate.php b/app/common/validate/RoleValidate.php index 6b2294e..dec4431 100644 --- a/app/common/validate/RoleValidate.php +++ b/app/common/validate/RoleValidate.php @@ -27,6 +27,6 @@ class RoleValidate extends Validate protected $scene = [ 'store' => ['name', 'desc', 'sort'], - 'update' => ['id', 'system_id', 'name', 'desc', 'sort', 'status'], + 'update' => ['id', 'name', 'desc', 'sort', 'status'], ]; } diff --git a/config/route.php b/config/route.php index 9ec3687..27ba099 100644 --- a/config/route.php +++ b/config/route.php @@ -51,7 +51,7 @@ Route::group('/common', function () { Route::group('/user', function () { Route::any('/info', [app\common\controller\UserController::class, 'info']); - Route::any('/get', [app\common\controller\UserController::class, 'getUser']); + // Route::any('/get', [app\common\controller\UserController::class, 'getUser']); }); Route::group('/preset', function () { @@ -209,7 +209,7 @@ Route::group('/crm', function () { Route::any('/upload/image', [app\common\controller\UploadController::class, 'uploadImage']); - Route::any('/user/edit', [app\common\controller\UserController::class, 'edit']); - Route::any('/user/savePassword', [app\common\controller\UserController::class, 'savePassword']); + // Route::any('/user/edit', [app\common\controller\UserController::class, 'edit']); + // Route::any('/user/savePassword', [app\common\controller\UserController::class, 'savePassword']); }); From 67861532ec2e193caf5aea03d200511490d1a027 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 09:16:02 +0800 Subject: [PATCH 06/48] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=85=AC=E6=B5=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E8=AF=A6=E6=83=85=E8=B7=9F=E8=BF=9B?= =?UTF-8?q?=E3=80=81=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 37 +++++++++++++ app/admin/service/UserService.php | 29 +++++++++- app/common/validate/UserValidate.php | 3 +- app/crm/controller/CustomerController.php | 13 +++-- app/crm/service/CustomerService.php | 5 ++ .../controller/CustomerController.php | 53 +++++++++++++++++++ app/crmAdmin/logic/CustomerLogic.php | 8 ++- app/crmAdmin/service/CustomerService.php | 53 ++++++++++++++++++- app/queue/redis/InquiryToCrm.php | 1 + config/route.php | 3 ++ 10 files changed, 198 insertions(+), 7 deletions(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index dfcebd7..3975aa3 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -6,6 +6,7 @@ use app\common\model\Corp; use app\common\traits\crud\CrudControllerTrait; use app\admin\service\UserService; use app\crm\model\Customer; +use support\Request; class UserController extends BaseController { @@ -18,6 +19,42 @@ class UserController extends BaseController $this->service = new UserService(); } + + /** + * 修改密码 + * @param Request $request + * @return \support\Response + * @throws \Random\RandomException + */ + public function savePassword(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'password'); + $data = $request->all(); + $result = $this->service->savePassword($request,$data);; + return $this->success($result, '编辑成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + /** + * 更新 + * + * @param Request $request 请求对象 + * @return mixed 返回更新成功的数据或信息 + */ + public function edit(Request $request) + { + try { + $data = $this->validate($this->service->getValidator(), $request->post(), 'update'); + $res = $this->service->serviceUpdate($request, $data); + return $this->success([], '更新成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + /** * 列表页数据格式化 * diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index f2e07fd..adbfd95 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -2,9 +2,11 @@ namespace app\admin\service; -use app\admin\validate\UserValidate; +use app\admin\logic\UserLogic; use app\common\traits\crud\CrudServiceTrait; use app\common\model\User; +use app\common\validate\UserValidate; +use support\exception\BusinessException; use support\Request; class UserService @@ -30,6 +32,14 @@ class UserService return new $this->validator; } + /** 更新 */ + public function serviceUpdate(Request $request, array $data = []) + { + $data = $this->preProcess('Update', $data, $request); + $config = $this->buildQueryConfig($request, 'edit'); + $updated = $this->logicUpdateBy($config, $data); + return $this->postProcess('Update', $data); + } /** * 构造 CrudUtil 查询配置 @@ -74,8 +84,25 @@ class UserService case 'destroy': $config['where']['id'] = $p['id']; break; + case 'savePassword': + $config['where']['id'] = $p['id']; + break; + case 'edit': + $config['where']['id'] = $request->user->uid; + break; } return $config; } + + /** + * 修改用户密码 + */ + public function savePassword(Request $request, array $data) + { + $config = $this->buildQueryConfig($request, 'savePassword'); + $data['password'] = password_hash($data['password'], PASSWORD_DEFAULT); + $user = $this->logicUpdateBy($config,$data); + return $user; + } } \ No newline at end of file diff --git a/app/common/validate/UserValidate.php b/app/common/validate/UserValidate.php index 7db260d..6330cb5 100644 --- a/app/common/validate/UserValidate.php +++ b/app/common/validate/UserValidate.php @@ -55,7 +55,8 @@ class UserValidate extends Validate 'feishu_register' => ['feishu_code'], 'upwd_login' => ['account' => 'require|checkAccount', 'password'], 'feishu_auth' => ['corp_abbr', 'system_code', 'login_type'], - 'feishu_login' => ['feishu_code'] + 'feishu_login' => ['feishu_code'], + 'password' => ['password'], ]; /** diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index 8b141a2..48744e4 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -325,6 +325,7 @@ class CustomerController extends BaseController 'lng' => Util::getParam($request, 'lng', 0), 'address' => Util::getParam($request, 'address', ''), 'sex' => Util::getParam($request, 'sex', 0), + 'obtain' => time(), ]; if (Util::isEmpty($id)) { @@ -485,10 +486,10 @@ class CustomerController extends BaseController return $this->error(trans('customer_id').trans('not_null')); } $data = [ - 'user_id' => $request->user->uid + 'user_id' => $request->user->uid, + 'obtain' => time(), ]; - try { Db::beginTransaction(); $customer= Customer::withTrashed()->find($customerId); @@ -592,6 +593,7 @@ class CustomerController extends BaseController try { $customer = $query->get(); + Db::beginTransaction(); foreach ($customer as $item) { //记录客户关系变化 $his = CustomerHis::create([ @@ -607,7 +609,12 @@ class CustomerController extends BaseController } } } - $res = $query->update(['user_id' => $user->id]); + + $data = [ + 'user_id' => $user->id, + 'obtain' => time(), + ]; + $res = $query->update($data); Db::commit(); } catch (\Throwable $e) { diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index 8621636..c41aace 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -162,6 +162,11 @@ class CustomerService return $config; } + /** + * 无用线索举报 + * @param $params + * @return false + */ public function report($params) { $id = $params['id']; diff --git a/app/crmAdmin/controller/CustomerController.php b/app/crmAdmin/controller/CustomerController.php index 153941a..a3dc0e2 100644 --- a/app/crmAdmin/controller/CustomerController.php +++ b/app/crmAdmin/controller/CustomerController.php @@ -3,6 +3,7 @@ namespace app\crmAdmin\controller; use app\common\model\Corp; +use app\crm\model\Customer; use app\crmAdmin\service\CustomerService; use support\Request; @@ -133,6 +134,37 @@ class CustomerController extends BaseController } } + /** + * 移除 + * @param Request $request + * @return \support\Response + */ + public function delete(Request $request) + { + try { + $param = $request->all(); + if (empty($param['customer_id'])) { + return $this->error('customer_id'.trans('not_null')); + } + + $where = [ + 'id' => $param['customer_id'], + ]; + $customer = Customer::where($where)->withTrashed()->first(); + if(empty($customer)){ + return $this->error( trans('fail')); + } + //软删除 + $customer->status = 3; + $res = $customer->save(); + $customer->delete(); + + return $this->success($res); + } catch (\Throwable $th) { + return $this->error($th->getMessage()); + } + } + /** * 客户详情 * @param Request $request @@ -154,4 +186,25 @@ class CustomerController extends BaseController } } + /** + * 客户详情 + * @param Request $request + * @return \support\Response + */ + public function follow(Request $request) + { + try { + $param = $request->all(); + if (empty($param['id'])) { + return $this->error('id'.trans('not_null')); + } + + $result = (new CustomerService())->follow($param); + + return $this->success($result); + } catch (\Throwable $th) { + return $this->error($th->getMessage()); + } + } + } \ No newline at end of file diff --git a/app/crmAdmin/logic/CustomerLogic.php b/app/crmAdmin/logic/CustomerLogic.php index 869982f..83ba426 100644 --- a/app/crmAdmin/logic/CustomerLogic.php +++ b/app/crmAdmin/logic/CustomerLogic.php @@ -13,6 +13,10 @@ class CustomerLogic $customer->status = $status; $res = $customer->save(); + if($status == 1){ + $customer->restore(); + } + return $res; } @@ -20,7 +24,9 @@ class CustomerLogic { $customer = Customer::withTrashed()->find($id); //强制删除 - $res = $customer->forceDelete(); +// $res = $customer->forceDelete(); + $customer->status = 3; + $res = $customer->save(); return $res; } } \ No newline at end of file diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 5f08943..041a514 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -4,6 +4,7 @@ namespace app\crmAdmin\service; use app\common\model\InquiryLog; use app\common\model\User; +use app\common\service\OssService; use app\crm\model\CustomerHis; use app\crmAdmin\logic\CustomerLogic; use app\crm\model\CarType; @@ -315,7 +316,42 @@ class CustomerService } } } - $res = $query->update(['user_id' => $userId]); + $data = [ + 'user_id' => $userId, + 'obtain' => time(), + ]; + $res = $query->update($data); + + Db::commit(); + return $res; + } catch (\Throwable $e) { + Db::rollback(); + throw $e; + } + } + + /** + * @param $params + * @return bool + */ + public function delete($params) + { + try { + Db::beginTransaction(); + $customerId = $params['customer_id']; + + $query= Customer::whereIn('id',explode(',',$customerId)); + $customer = $query->get(); + + foreach ($customer as $item) { + //记录客户关系变化 + $his = CustomerHis::create([ + 'customer_id' => $item->id, + 'user_his' => $item->user_id, + 'user_id' => 0, + ]); + } + $res = $query->update(['user_id' => 0]); Db::commit(); return $res; @@ -394,4 +430,19 @@ class CustomerService return $customer; } + + public function follow($params) + { + $id = $params['id']; + $follow = Follow:: + where('customer_id', $id) + ->first(); + + $ossservice = new OssService(); + foreach ($follow as $item) { + $item['picture_full'] = $item->picture??$ossservice->generatePrivateUrl($item->picture); + } + + return $follow; + } } \ No newline at end of file diff --git a/app/queue/redis/InquiryToCrm.php b/app/queue/redis/InquiryToCrm.php index 8e1ae51..7bec9ca 100644 --- a/app/queue/redis/InquiryToCrm.php +++ b/app/queue/redis/InquiryToCrm.php @@ -60,6 +60,7 @@ class InquiryToCrm implements Consumer $crmCustomer->contacts = $info->contacts; $crmCustomer->desc_collect = $info->content; $crmCustomer->enter_user_id = $info->enter_user_id; + $crmCustomer->obtain = time(); // 修改同步CRM状态 $info->sync_crm = 1; // 保存 diff --git a/config/route.php b/config/route.php index 44bbe64..e86a342 100644 --- a/config/route.php +++ b/config/route.php @@ -79,6 +79,7 @@ Route::group('/admin', function () { Route::any('/list', [app\admin\controller\UserController::class, 'index']); Route::any('/show', [app\admin\controller\UserController::class, 'show']); Route::any('/update', [app\admin\controller\UserController::class, 'update']); + Route::any('/update/password', [app\admin\controller\UserController::class, 'savePassword']); }); // 公司 @@ -119,6 +120,8 @@ Route::group('/admin', function () { Route::any('/audit', [app\crmAdmin\controller\CustomerController::class, 'audit']); Route::any('/transfer', [app\crmAdmin\controller\CustomerController::class, 'transfer']); Route::any('/detail', [app\crmAdmin\controller\CustomerController::class, 'detail']); + Route::any('/delete', [app\crmAdmin\controller\CustomerController::class, 'delete']); + Route::any('/follow', [app\crmAdmin\controller\CustomerController::class, 'follow']); }); }); }); From 069dcb057635a4b1d38ac118fab326a507d9d2e1 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 10:09:49 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/route.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/config/route.php b/config/route.php index d4099c1..6535c87 100644 --- a/config/route.php +++ b/config/route.php @@ -75,14 +75,6 @@ Route::group('/admin', function () { Route::any('/menu/resource', [app\admin\controller\RoleController::class, 'menuResource']); }); - // 用户 - Route::group('/user', function () { - Route::any('/list', [app\admin\controller\UserController::class, 'index']); - Route::any('/show', [app\admin\controller\UserController::class, 'show']); - Route::any('/update', [app\admin\controller\UserController::class, 'update']); - Route::any('/update/password', [app\admin\controller\UserController::class, 'savePassword']); - }); - // 公司 Route::group('/corp', function () { Route::any('/list', [app\admin\controller\CorpController::class, 'index']); @@ -128,6 +120,7 @@ Route::group('/admin', function () { Route::any('/update', [app\admin\controller\UserController::class, 'update']); Route::any('/authorize', [app\admin\controller\UserController::class, 'authorize']); Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); + Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); }); // 询单 From b7b2950d395ff25bcc25113c98c5683ed24a4af3 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 10:17:18 +0800 Subject: [PATCH 08/48] 1 --- config/route.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/route.php b/config/route.php index 6535c87..ab46ed1 100644 --- a/config/route.php +++ b/config/route.php @@ -120,7 +120,7 @@ Route::group('/admin', function () { Route::any('/update', [app\admin\controller\UserController::class, 'update']); Route::any('/authorize', [app\admin\controller\UserController::class, 'authorize']); Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); - Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); + Route::any('/update/password', [app\admin\controller\UserController::class, 'savePassword']); }); // 询单 From c40d0bcec34cfa37afbb5546b141ef882e7a3998 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 10:36:32 +0800 Subject: [PATCH 09/48] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=BA=E6=94=BE=E5=85=A5=E5=85=AC=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/controller/CustomerController.php | 77 +++++++---------------- config/route.php | 1 - 2 files changed, 24 insertions(+), 54 deletions(-) diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index 48744e4..b00af0d 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -394,13 +394,31 @@ class CustomerController extends BaseController if(empty($customer)){ return $this->error( trans('fail')); } - if($force == 'force'){ - //强制删除 - $res = $customer->forceDelete(); - }else{ - //软删除 - $res = $customer->delete(); + try { + Db::beginTransaction(); + if ($force == 'force') { + //强制删除 + $res = $customer->forceDelete(); + } else { + $customer->user_id = 0; + $customer->save(); + + //记录客户关系变化 + $his = CustomerHis::create([ + 'customer_id' => $id, + 'user_his' => $userId, + 'user_id' => 0, + ]); + + //软删除 + $res = $customer->delete(); + } + Db::commit(); + } catch (\Throwable $e) { + Db::rollback(); + return $this->error($e->getMessage()); } + if ($res) { return $this->success($res, trans('success')); } else { @@ -527,53 +545,6 @@ class CustomerController extends BaseController } } - /** - * 客户转移至公海 - * @param Request $request - * @return \support\Response - */ - public function putSeas(Request $request) - { - $customerId = Util::getParam($request, 'customer_id'); - $userId = $request->user->uid; - if (Util::isEmpty($customerId)) { - return $this->error(trans('customer_id').trans('not_null')); - } - - try { - Db::beginTransaction(); - $customer= Customer::withTrashed()->where('user_id',$userId)->find($customerId); - - if(empty($customer)){ - return $this->error( 'customer_id错误'); - } - $data = [ - 'user_id' => 0, - ]; - - $res = $customer->update($data); - - //记录客户关系变化 - $his = CustomerHis::create([ - 'customer_id' => $customerId, - 'user_his' => $userId, - 'user_id' => 0, - ]); - Db::commit(); - } catch (\Throwable $e) { - Db::rollback(); - return $this->error($e->getMessage()); - } - - if ($res) { - return $this->success($res, trans('success')); - } else { - return $this->error(trans('fail')); - } - } - - - /** * 批量转让 * @param Request $request diff --git a/config/route.php b/config/route.php index e86a342..c4d9161 100644 --- a/config/route.php +++ b/config/route.php @@ -175,7 +175,6 @@ Route::group('/crm', function () { Route::any('/customer/getCountry', [app\crm\controller\CustomerController::class, 'getCountry']); Route::any('/customer/followNext', [app\crm\controller\CustomerController::class, 'followNext']); Route::any('/customer/report', [app\crm\controller\CustomerController::class, 'report']); - Route::any('/customer/seas', [app\crm\controller\CustomerController::class, 'putSeas']); Route::any('/tagGroup/list', [app\crm\controller\TagGroupController::class, 'list']); Route::any('/tagGroup/updatePivot', [app\crm\controller\TagGroupController::class, 'updatePivot']); From 394872af91e389e3d57345254c1410d9bb299431 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 10:39:18 +0800 Subject: [PATCH 10/48] user --- app/common/controller/UserController.php | 98 ++++++++++++------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index 9f5d35d..d4fe0f4 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -72,57 +72,57 @@ class UserController extends BaseController } } - // /** - // * 用户信息 - // */ - // public function getUser(Request $request) - // { - // try { - // $uid = $request->user->uid; - // $corp_abbr = $request->basic_data['corp_abbr']; - // $result = (new UserService())->getUser($uid,$corp_abbr); - // return $this->success($result, '获取用户信息'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } + /** + * 用户信息 + */ + public function getUser(Request $request) + { + try { + $uid = $request->user->uid; + $corp_abbr = $request->basic_data['corp_abbr']; + $result = (new UserService())->getUser($uid,$corp_abbr); + return $this->success($result, '获取用户信息'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } - // /** - // * 编辑用户 - // */ - // public function edit(Request $request) - // { - // try { - // $uid = $request->user->uid; - // $data = $request->all(); - // $result = (new UserService())->edit($uid,$data); - // unset($result['password']); - // unset($result['union_id']); - // unset($result['open_id']); - // unset($result['tenant_key']); - // return $this->success($result, '编辑成功'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } + /** + * 编辑用户 + */ + public function edit(Request $request) + { + try { + $uid = $request->user->uid; + $data = $request->all(); + $result = (new UserService())->edit($uid,$data); + unset($result['password']); + unset($result['union_id']); + unset($result['open_id']); + unset($result['tenant_key']); + return $this->success($result, '编辑成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } - // /** - // * 修改密码 - // * @param Request $request - // * @return \support\Response - // * @throws \Random\RandomException - // */ - // public function savePassword(Request $request) - // { - // try { - // $uid = $request->user->uid; - // $data = $request->all(); - // $result = (new UserService())->savePassword($uid,$data);; - // return $this->success($result, '编辑成功'); - // } catch (\Throwable $e) { - // return $this->error($e->getMessage()); - // } - // } + /** + * 修改密码 + * @param Request $request + * @return \support\Response + * @throws \Random\RandomException + */ + public function savePassword(Request $request) + { + try { + $uid = $request->user->uid; + $data = $request->all(); + $result = (new UserService())->savePassword($uid,$data);; + return $this->success($result, '编辑成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file From 122628663cea0a1af5c7efbf27900a0c14022bfd Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 14:18:11 +0800 Subject: [PATCH 11/48] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90&?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/ResourceService.php | 6 +- app/common/utils/Tree.php | 673 +++++++++++------- .../utils/scaffold/templates/workOrder.stub | 102 +++ app/controller/IndexController.php | 14 +- app/functions.php | 19 +- 5 files changed, 558 insertions(+), 256 deletions(-) create mode 100644 app/common/utils/scaffold/templates/workOrder.stub diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index 5c73800..c2469ef 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -95,19 +95,19 @@ class ResourceService protected function afterServiceListAll($data) { - $data = Tree::buildWithAuthListAndReference($data->toArray()); + $data = Tree::buildMenuTreeWithReference($data->toArray()); return $data; } protected function afterServiceMenuList($data) { - $data = Tree::buildWithReference($data->toArray()); + $data = Tree::buildMenuTree($data->toArray()); return $data; } protected function afterServiceMenuTreeList($data) { - $data = Tree::buildWithReference($data->toArray()); + $data = Tree::buildMenuTree($data->toArray()); return $data; } } \ No newline at end of file diff --git a/app/common/utils/Tree.php b/app/common/utils/Tree.php index 6322e36..9210964 100644 --- a/app/common/utils/Tree.php +++ b/app/common/utils/Tree.php @@ -4,30 +4,379 @@ namespace app\common\utils; class Tree { + // /** + // * 递归构建树形结构 + // * + // * @param array $data 数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @param int $level 当前层级 + // * @return array + // */ + // public static function build(array $data, int $parentId = 0, string $pidField = 'parent_id', string $idField = 'id', int $level = 0): array + // { + // $tree = []; + + // foreach ($data as $item) { + // if ($item[$pidField] == $parentId) { + // $item['level'] = $level; + // $children = static::build($data, $item[$idField], $pidField, $idField, $level + 1); + + // if (!empty($children)) { + // $item['children'] = $children; + // } + + // $tree[] = $item; + // } + // } + + // return $tree; + // } + + // /** + // * 使用引用方式构建树形结构（性能更好） + // * + // * @param array $data 数据列表 + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @return array + // */ + // public static function buildWithReference(array $data, string $pidField = 'parent_id', string $idField = 'id'): array + // { + // $items = []; + // $tree = []; + + // // 建立以id为索引的数组 + // foreach ($data as $item) { + // $item['level'] = 0; + // $items[$item[$idField]] = $item; + // } + + // // 构建树形结构 + // foreach ($items as $id => $item) { + // if ($item[$pidField] == 0) { + // $tree[] = &$items[$id]; + // } else { + // if (isset($items[$item[$pidField]])) { + // $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; + + // if (!isset($items[$item[$pidField]]['children'])) { + // $items[$item[$pidField]]['children'] = []; + // } + + // $items[$item[$pidField]]['children'][] = &$items[$id]; + // } + // } + // } + + // return $tree; + // } + + // /** + // * 将树形结构扁平化为列表（带层级前缀） + // * + // * @param array $tree 树形结构数据 + // * @param string $prefix 前缀字符 + // * @param string $field 显示字段名 + // * @param int $level 层级 + // * @return array + // */ + // public static function flattenWithPrefix(array $tree, string $prefix = '--', string $field = 'name', int $level = 0): array + // { + // $result = []; + + // foreach ($tree as $item) { + // $item[$field . '_with_prefix'] = str_repeat($prefix, $item['level']) . $item[$field]; + // $result[] = $item; + + // if (isset($item['children']) && !empty($item['children'])) { + // $children = static::flattenWithPrefix($item['children'], $prefix, $field, $item['level'] + 1); + // $result = array_merge($result, $children); + // } + // } + + // return $result; + // } + + // /** + // * 根据父ID查找所有子节点（包括子孙节点） + // * + // * @param array $data 数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @return array + // */ + // public static function findChildren(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array + // { + // $children = []; + + // foreach ($data as $item) { + // if ($item[$pidField] == $parentId) { + // $children[] = $item; + // $grandChildren = static::findChildren($data, $item[$idField], $pidField, $idField); + // $children = array_merge($children, $grandChildren); + // } + // } + + // return $children; + // } + + // /** + // * 获取指定节点的所有父级节点 + // * + // * @param array $data 数据列表 + // * @param int $id 当前节点ID + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @return array + // */ + // public static function getParents(array $data, int $id, string $pidField = 'parent_id', string $idField = 'id'): array + // { + // $parents = []; + + // foreach ($data as $item) { + // if ($item[$idField] == $id) { + // if ($item[$pidField] != 0) { + // $parents[] = $item; + // $parentParents = static::getParents($data, $item[$pidField], $pidField, $idField); + // $parents = array_merge($parents, $parentParents); + // } + // break; + // } + // } + + // return $parents; + // } + + // /** + // * 获取指定节点的子孙节点ID列表 + // * + // * @param array $data 数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @return array + // */ + // public static function getChildrenIds(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array + // { + // $ids = []; + // $children = static::findChildren($data, $parentId, $pidField, $idField); + + // foreach ($children as $child) { + // $ids[] = $child[$idField]; + // } + + // return $ids; + // } + + // /** + // * 检查是否有子节点 + // * + // * @param array $data 数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @return bool + // */ + // public static function hasChildren(array $data, int $parentId, string $pidField = 'parent_id'): bool + // { + // foreach ($data as $item) { + // if ($item[$pidField] == $parentId) { + // return true; + // } + // } + + // return false; + // } + + + // /** + // * 构建带有权限列表的资源树（权限不显示在树结构中） + // * + // * @param array $data 资源数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @param string $typeField 类型字段名 + // * @param string $permissionType 权限类型标识 + // * @param int $level 当前层级 + // * @return array + // */ + // public static function buildWithAuthList( + // array $data, + // int $parentId = 0, + // string $pidField = 'parent_id', + // string $idField = 'id', + // string $typeField = 'type', + // string $permissionType = 'permission', + // int $level = 0 + // ): array { + // $tree = []; + + // foreach ($data as $item) { + // // 只处理指定父级的非权限节点 + // if ($item[$pidField] == $parentId && $item[$typeField] != $permissionType) { + // $item['level'] = $level; + + // // 递归处理子节点（非权限类型） + // $children = static::buildWithAuthList($data, $item[$idField], $pidField, $idField, $typeField, $permissionType, $level + 1); + + // if (!empty($children)) { + // $item['children'] = $children; + // } + + // // 收集当前节点下的所有权限 + // $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); + + // $tree[] = $item; + // } + // } + + // return $tree; + // } + + // /** + // * 收集指定节点下的直接权限项（只收集直接子节点中的权限） + // * + // * @param array $data 数据列表 + // * @param int $parentId 父级ID + // * @param string $pidField 父级字段名 + // * @param string $typeField 类型字段名 + // * @param string $permissionType 权限类型标识 + // * @return array + // */ + // public static function collectDirectPermissions1( + // array $data, + // int $parentId, + // string $pidField = 'parent_id', + // string $typeField = 'type', + // string $permissionType = 'permission' + // ): array { + // $permissions = []; + + // foreach ($data as $item) { + // // 收集直接子节点中的权限类型 + // if ($item[$pidField] == $parentId && $item[$typeField] == $permissionType) { + // $permissions[] = $item; + // } + // } + + // return $permissions; + // } + + // /** + // * 使用引用方式构建带有权限列表的资源树（权限不显示在树结构中） + // * + // * @param array $data 资源数据列表 + // * @param string $pidField 父级字段名 + // * @param string $idField ID字段名 + // * @param string $typeField 类型字段名 + // * @param string $permissionType 权限类型标识 + // * @return array + // */ + // public static function buildWithAuthListAndReference( + // array $data, + // string $pidField = 'parent_id', + // string $idField = 'id', + // string $typeField = 'type', + // string $permissionType = 'permission' + // ): array { + // $items = []; + // $tree = []; + + // // 建立以id为索引的数组（只包含非权限节点） + // foreach ($data as $item) { + // if ($item[$typeField] != $permissionType) { + // $item['level'] = 0; + // $items[$item[$idField]] = $item; + // } + // } + + // // 构建树形结构 + // foreach ($items as $id => $item) { + // if ($item[$pidField] == 0) { + // $tree[] = &$items[$id]; + // } else { + // if (isset($items[$item[$pidField]])) { + // $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; + + // if (!isset($items[$item[$pidField]]['children'])) { + // $items[$item[$pidField]]['children'] = []; + // } + + // $items[$item[$pidField]]['children'][] = &$items[$id]; + // } + // } + // } + + // // 为每个节点添加权限列表 + // foreach ($items as &$item) { + // $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); + // } + + // return $tree; + // } + + + + // 8.13 add /** - * 递归构建树形结构 + * 构建前端需要的菜单树结构 * - * @param array $data 数据列表 + * @param array $data 服务端菜单数据 * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @param int $level 当前层级 * @return array */ - public static function build(array $data, int $parentId = 0, string $pidField = 'parent_id', string $idField = 'id', int $level = 0): array + public static function buildMenuTree(array $data, int $parentId = 0): array { $tree = []; foreach ($data as $item) { - if ($item[$pidField] == $parentId) { - $item['level'] = $level; - $children = static::build($data, $item[$idField], $pidField, $idField, $level + 1); + // 只处理非权限类型的节点 + if ($item['parent_id'] == $parentId && $item['type'] != 'permission') { + // 转换数据结构以匹配前端需要的格式 + $menuItem = [ + 'id' => $item['id'], + 'path' => $item['url'] ?? '', + 'name' => $item['name'], + 'component' => $item['url'] ?? '', + 'meta' => [ + 'title' => $item['name'], + 'icon' => $item['icon'] ?? '', + 'isHide' => !empty($item['is_hide']), + 'isHideTab' => !empty($item['is_hide_tab']), + 'keepAlive' => !empty($item['keep_alive']), + ] + ]; - if (!empty($children)) { - $item['children'] = $children; + // 收集当前节点下的所有权限 + $permissions = static::collectDirectPermissions($data, $item['id']); + if (!empty($permissions)) { + $authList = []; + foreach ($permissions as $permission) { + $authList[] = [ + 'id' => $permission['id'], + 'title' => $permission['name'] ?? '', + 'authMark' => $permission['code'] ?? '' + ]; + } + $menuItem['meta']['authList'] = $authList; } - $tree[] = $item; + // 将服务端额外字段放入meta中 + $extraFields = static::getExtraFields($item); + if (!empty($extraFields)) { + $menuItem['meta'] = array_merge($menuItem['meta'], $extraFields); + } + + // 递归处理子菜单 + $children = static::buildMenuTree($data, $item['id']); + if (!empty($children)) { + $menuItem['children'] = $children; + } + + $tree[] = $menuItem; } } @@ -35,201 +384,72 @@ class Tree } /** - * 使用引用方式构建树形结构（性能更好） + * 使用引用方式构建前端需要的菜单树结构（性能更好） * - * @param array $data 数据列表 - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 + * @param array $data 服务端菜单数据 * @return array */ - public static function buildWithReference(array $data, string $pidField = 'parent_id', string $idField = 'id'): array + public static function buildMenuTreeWithReference(array $data): array { $items = []; $tree = []; - // 建立以id为索引的数组 - foreach ($data as $item) { - $item['level'] = 0; - $items[$item[$idField]] = $item; + // 过滤出菜单类型的节点并转换数据结构 + $menuData = array_filter($data, function($item) { + return ($item['type'] ?? '') != 'permission'; + }); + + // 建立以id为索引的数组并转换数据结构 + foreach ($menuData as $item) { + $items[$item['id']] = [ + 'id' => $item['id'], + 'path' => $item['url'] ?? '', + 'name' => $item['name'], + 'component' => $item['url'] ?? '', + 'meta' => [ + 'title' => $item['name'], + 'icon' => $item['icon'] ?? '', + 'isHide' => !empty($item['is_hide']), + 'isHideTab' => !empty($item['is_hide_tab']), + 'keepAlive' => !empty($item['keep_alive']), + ] + ]; + + // 将服务端额外字段放入meta中 + $extraFields = static::getExtraFields($item); + if (!empty($extraFields)) { + $items[$item['id']]['meta'] = array_merge($items[$item['id']]['meta'], $extraFields); + } } // 构建树形结构 - foreach ($items as $id => $item) { - if ($item[$pidField] == 0) { - $tree[] = &$items[$id]; + foreach ($menuData as $item) { + if ($item['parent_id'] == 0) { + $tree[] = &$items[$item['id']]; } else { - if (isset($items[$item[$pidField]])) { - $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; - - if (!isset($items[$item[$pidField]]['children'])) { - $items[$item[$pidField]]['children'] = []; + if (isset($items[$item['parent_id']])) { + if (!isset($items[$item['parent_id']]['children'])) { + $items[$item['parent_id']]['children'] = []; } - - $items[$item[$pidField]]['children'][] = &$items[$id]; + $items[$item['parent_id']]['children'][] = &$items[$item['id']]; } } } - return $tree; - } - - /** - * 将树形结构扁平化为列表（带层级前缀） - * - * @param array $tree 树形结构数据 - * @param string $prefix 前缀字符 - * @param string $field 显示字段名 - * @param int $level 层级 - * @return array - */ - public static function flattenWithPrefix(array $tree, string $prefix = '--', string $field = 'name', int $level = 0): array - { - $result = []; - - foreach ($tree as $item) { - $item[$field . '_with_prefix'] = str_repeat($prefix, $item['level']) . $item[$field]; - $result[] = $item; - - if (isset($item['children']) && !empty($item['children'])) { - $children = static::flattenWithPrefix($item['children'], $prefix, $field, $item['level'] + 1); - $result = array_merge($result, $children); - } - } - - return $result; - } - - /** - * 根据父ID查找所有子节点（包括子孙节点） - * - * @param array $data 数据列表 - * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @return array - */ - public static function findChildren(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array - { - $children = []; - - foreach ($data as $item) { - if ($item[$pidField] == $parentId) { - $children[] = $item; - $grandChildren = static::findChildren($data, $item[$idField], $pidField, $idField); - $children = array_merge($children, $grandChildren); - } - } - - return $children; - } - - /** - * 获取指定节点的所有父级节点 - * - * @param array $data 数据列表 - * @param int $id 当前节点ID - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @return array - */ - public static function getParents(array $data, int $id, string $pidField = 'parent_id', string $idField = 'id'): array - { - $parents = []; - - foreach ($data as $item) { - if ($item[$idField] == $id) { - if ($item[$pidField] != 0) { - $parents[] = $item; - $parentParents = static::getParents($data, $item[$pidField], $pidField, $idField); - $parents = array_merge($parents, $parentParents); + // 为每个节点添加权限列表 + foreach ($items as &$item) { + $parentId = $item['id']; + $permissions = static::collectDirectPermissions($data, $parentId); + if (!empty($permissions)) { + $authList = []; + foreach ($permissions as $permission) { + $authList[] = [ + 'id' => $permission['id'], + 'title' => $permission['name'] ?? '', + 'authMark' => $permission['code'] ?? '' + ]; } - break; - } - } - - return $parents; - } - - /** - * 获取指定节点的子孙节点ID列表 - * - * @param array $data 数据列表 - * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @return array - */ - public static function getChildrenIds(array $data, int $parentId, string $pidField = 'parent_id', string $idField = 'id'): array - { - $ids = []; - $children = static::findChildren($data, $parentId, $pidField, $idField); - - foreach ($children as $child) { - $ids[] = $child[$idField]; - } - - return $ids; - } - - /** - * 检查是否有子节点 - * - * @param array $data 数据列表 - * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @return bool - */ - public static function hasChildren(array $data, int $parentId, string $pidField = 'parent_id'): bool - { - foreach ($data as $item) { - if ($item[$pidField] == $parentId) { - return true; - } - } - - return false; - } - - - /** - * 构建带有权限列表的资源树（权限不显示在树结构中） - * - * @param array $data 资源数据列表 - * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @param string $typeField 类型字段名 - * @param string $permissionType 权限类型标识 - * @param int $level 当前层级 - * @return array - */ - public static function buildWithAuthList( - array $data, - int $parentId = 0, - string $pidField = 'parent_id', - string $idField = 'id', - string $typeField = 'type', - string $permissionType = 'permission', - int $level = 0 - ): array { - $tree = []; - - foreach ($data as $item) { - // 只处理指定父级的非权限节点 - if ($item[$pidField] == $parentId && $item[$typeField] != $permissionType) { - $item['level'] = $level; - - // 递归处理子节点（非权限类型） - $children = static::buildWithAuthList($data, $item[$idField], $pidField, $idField, $typeField, $permissionType, $level + 1); - - if (!empty($children)) { - $item['children'] = $children; - } - - // 收集当前节点下的所有权限 - $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); - - $tree[] = $item; + $item['meta']['authList'] = $authList; } } @@ -241,23 +461,15 @@ class Tree * * @param array $data 数据列表 * @param int $parentId 父级ID - * @param string $pidField 父级字段名 - * @param string $typeField 类型字段名 - * @param string $permissionType 权限类型标识 * @return array */ - public static function collectDirectPermissions( - array $data, - int $parentId, - string $pidField = 'parent_id', - string $typeField = 'type', - string $permissionType = 'permission' - ): array { + public static function collectDirectPermissions(array $data, int $parentId): array + { $permissions = []; foreach ($data as $item) { // 收集直接子节点中的权限类型 - if ($item[$pidField] == $parentId && $item[$typeField] == $permissionType) { + if ($item['parent_id'] == $parentId && ($item['type'] ?? '') == 'permission') { $permissions[] = $item; } } @@ -266,55 +478,28 @@ class Tree } /** - * 使用引用方式构建带有权限列表的资源树（权限不显示在树结构中） + * 获取需要放入meta的额外字段 * - * @param array $data 资源数据列表 - * @param string $pidField 父级字段名 - * @param string $idField ID字段名 - * @param string $typeField 类型字段名 - * @param string $permissionType 权限类型标识 + * @param array $item 菜单项 * @return array */ - public static function buildWithAuthListAndReference( - array $data, - string $pidField = 'parent_id', - string $idField = 'id', - string $typeField = 'type', - string $permissionType = 'permission' - ): array { - $items = []; - $tree = []; + public static function getExtraFields(array $item): array + { + $extraFields = []; + $standardFields = [ + 'id', 'name', 'url', 'icon', 'parent_id', 'type', 'is_hide', + 'is_hide_tab', 'keep_alive', 'code', 'level' + ]; - // 建立以id为索引的数组（只包含非权限节点） - foreach ($data as $item) { - if ($item[$typeField] != $permissionType) { - $item['level'] = 0; - $items[$item[$idField]] = $item; + foreach ($item as $key => $value) { + // 如果不是标准字段且不是auth_list，则放入extraFields + if (!in_array($key, $standardFields) && $key !== 'auth_list') { + // 转换下划线命名到驼峰命名 + $camelKey = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $key)))); + $extraFields[$camelKey] = $value; } } - // 构建树形结构 - foreach ($items as $id => $item) { - if ($item[$pidField] == 0) { - $tree[] = &$items[$id]; - } else { - if (isset($items[$item[$pidField]])) { - $items[$id]['level'] = $items[$item[$pidField]]['level'] + 1; - - if (!isset($items[$item[$pidField]]['children'])) { - $items[$item[$pidField]]['children'] = []; - } - - $items[$item[$pidField]]['children'][] = &$items[$id]; - } - } - } - - // 为每个节点添加权限列表 - foreach ($items as &$item) { - $item['auth_list'] = static::collectDirectPermissions($data, $item[$idField], $pidField, $typeField, $permissionType); - } - - return $tree; + return $extraFields; } } \ No newline at end of file diff --git a/app/common/utils/scaffold/templates/workOrder.stub b/app/common/utils/scaffold/templates/workOrder.stub new file mode 100644 index 0000000..c7b6ab0 --- /dev/null +++ b/app/common/utils/scaffold/templates/workOrder.stub @@ -0,0 +1,102 @@ + + + + + + 邮箱提醒 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index 995f05e..8a73bbd 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -106,13 +106,13 @@ class IndexController public function test() { - $uidRotator = new \app\common\utils\RedisUidRotator('email_parsed_result_20250804'); - $uidRotator->setUids([64, 63, 83, 93, 108, 118, 131, 132, 145, 150, 143, 156, 157, 158]); + $data = [ + 'code' => 'GD20250703-1DC80', + 'category' => '账号类问题', + 'content' => '这是一条测试工单内容。' + ]; + \app\common\utils\email\MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的工单提醒', replaceTpl($data, 'work_order')); - $assignedUid = $uidRotator->next(); - - flg($assignedUid, false); - - return $assignedUid; + return 22; } } \ No newline at end of file diff --git a/app/functions.php b/app/functions.php index 59fdd24..299bad4 100644 --- a/app/functions.php +++ b/app/functions.php @@ -158,9 +158,10 @@ if (!function_exists('sendFeishuTextMessage')) { * 替换模板 */ if (!function_exists('replaceTpl')) { - function replaceTpl(array $data = [], string $templatePath = 'common/utils/scaffold/templates/Email.stub') + function replaceTpl(array $data = [], string $tplKey = 'email') { - if (!$data || !$templatePath) return ''; + if (!$data || !$tplKey) return ''; + $templatePath = tplUrl($tplKey); $templatePath = app_path($templatePath); $content = file_get_contents($templatePath); foreach ($data as $key => $value) { @@ -170,6 +171,20 @@ if (!function_exists('replaceTpl')) { } } +/** + * 模板路径 + */ +if (!function_exists('tplUrl')) { + function tplUrl(string $tplKey = '') + { + $urlArray = [ + 'email' => 'common/utils/scaffold/templates/Email.stub', + 'work_order' => 'common/utils/scaffold/templates/workOrder.stub' + ]; + return $urlArray[$tplKey]; + } +} + /** * 替换模板 */ From 2696f52db261bd3562be7ddd827f1eedef997dd7 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 15:18:36 +0800 Subject: [PATCH 12/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=88=E6=9D=83&&=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/AuthLogic.php | 6 ++ app/common/utils/Tree.php | 3 +- app/controller/IndexController.php | 18 ++++-- app/queue/redis/PermAgt.php | 95 ++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 8 deletions(-) create mode 100644 app/queue/redis/PermAgt.php diff --git a/app/common/logic/AuthLogic.php b/app/common/logic/AuthLogic.php index b2a74fc..9857df8 100644 --- a/app/common/logic/AuthLogic.php +++ b/app/common/logic/AuthLogic.php @@ -118,6 +118,12 @@ class AuthLogic } // 是否登陆 $user->isLogin = false; + + $options = [ + 'corp_id' => $user->corp_id, + 'user_id' => $user->id + ]; + \Webman\RedisQueue\Redis::send('perm-agt', $options); } else { $updated = [ 'union_id' => $feishuUserInfo['union_id'], diff --git a/app/common/utils/Tree.php b/app/common/utils/Tree.php index 9210964..478eb10 100644 --- a/app/common/utils/Tree.php +++ b/app/common/utils/Tree.php @@ -487,8 +487,7 @@ class Tree { $extraFields = []; $standardFields = [ - 'id', 'name', 'url', 'icon', 'parent_id', 'type', 'is_hide', - 'is_hide_tab', 'keep_alive', 'code', 'level' + 'id', 'name', 'url', 'icon', 'is_hide', 'is_hide_tab', 'keep_alive', 'level' ]; foreach ($item as $key => $value) { diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index 8a73bbd..3875843 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -106,12 +106,18 @@ class IndexController public function test() { - $data = [ - 'code' => 'GD20250703-1DC80', - 'category' => '账号类问题', - 'content' => '这是一条测试工单内容。' - ]; - \app\common\utils\email\MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的工单提醒', replaceTpl($data, 'work_order')); + // $data = [ + // 'code' => 'GD20250703-1DC80', + // 'category' => '账号类问题', + // 'content' => '这是一条测试工单内容。' + // ]; + // \app\common\utils\email\MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的工单提醒', replaceTpl($data, 'work_order')); + + // $options = [ + // 'corp_id' => 3, + // 'user_id' => 666 + // ]; + // \Webman\RedisQueue\Redis::send('perm-agt', $options); return 22; } diff --git a/app/queue/redis/PermAgt.php b/app/queue/redis/PermAgt.php new file mode 100644 index 0000000..42a4898 --- /dev/null +++ b/app/queue/redis/PermAgt.php @@ -0,0 +1,95 @@ + $userId, + 'role_id' => 1 + ], + [ + 'user_id' => $userId, + 'role_id' => 2 + ], + ]; + $systems = [ + [ + 'user_id' => $userId, + 'system_id' => 1 + ], + [ + 'user_id' => $userId, + 'system_id' => 2 + ], + [ + 'user_id' => $userId, + 'system_id' => 3 + ], + ]; + } else { + $roles = [ + 'user_id' => $userId, + 'role_id' => 2 + ]; + $systems = [ + [ + 'user_id' => $userId, + 'system_id' => 2 + ], + [ + 'user_id' => $userId, + 'system_id' => 3 + ], + ]; + } + + Db::table('user_roles')->insert($roles); + Db::table('user_systems')->insert($systems); + return true; + } catch (\Throwable $th) { + throw new BusinessException($th->getFile()."|".$th->getLine()."|".$th->getMessage()); + } + } + + // 消费失败回调 + /* + $package = [ + 'id' => 1357277951, // 消息ID + 'time' => 1709170510, // 消息时间 + 'delay' => 0, // 延迟时间 + 'attempts' => 2, // 消费次数 + 'queue' => 'send-mail', // 队列名 + 'data' => ['to' => 'tom@gmail.com', 'content' => 'hello'], // 消息内容 + 'max_attempts' => 5, // 最大重试次数 + 'error' => '错误信息' // 错误信息 + ] + */ + public function onConsumeFailure(\Throwable $e, $package) + { + echo "consume failure\n"; + echo $e->getMessage() . "\n"; + // 无需反序列化 + var_export($package); + } +} \ No newline at end of file From 9ae23153f640dee3accd6a870f7003aade5d651e Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Wed, 13 Aug 2025 17:00:16 +0800 Subject: [PATCH 13/48] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utils/scaffold/templates/workOrder.stub | 1 + app/ticket/logic/CategorieLogic.php | 8 +++++ app/ticket/logic/ConversationLogic.php | 14 ++++++++ app/ticket/service/ConversationService.php | 36 +++++++++++++++++++ app/ticket/service/TicketService.php | 3 ++ 5 files changed, 62 insertions(+) diff --git a/app/common/utils/scaffold/templates/workOrder.stub b/app/common/utils/scaffold/templates/workOrder.stub index c7b6ab0..9f592dd 100644 --- a/app/common/utils/scaffold/templates/workOrder.stub +++ b/app/common/utils/scaffold/templates/workOrder.stub @@ -80,6 +80,7 @@
  • 工单编号：{{code}}
  • 工单分类：{{category}}
  • 问题描述：{{content}}
    • + {{reply}}

    请点击下方按钮立即查看详情：

    diff --git a/app/ticket/logic/CategorieLogic.php b/app/ticket/logic/CategorieLogic.php index c11bd64..f9f1014 100644 --- a/app/ticket/logic/CategorieLogic.php +++ b/app/ticket/logic/CategorieLogic.php @@ -23,6 +23,14 @@ class CategorieLogic return Categorie::with('translation')->where($where)->get(); } + public function find($id) + { + return Categorie::with('translation') + ->where('status',1) + ->where('locale', locale()) + ->find($id); + } + public function add(array $data) { try { diff --git a/app/ticket/logic/ConversationLogic.php b/app/ticket/logic/ConversationLogic.php index d47a709..53a5a18 100644 --- a/app/ticket/logic/ConversationLogic.php +++ b/app/ticket/logic/ConversationLogic.php @@ -18,6 +18,7 @@ class ConversationLogic $current = $params['current'] ?? 1; return Conversation::where($where)->paginate($size, ['*'], 'page', $current); } + public function add(array $data) { try { @@ -43,4 +44,17 @@ class ConversationLogic throw new BusinessException('会话编辑失败，请稍后重试', 500); } } + + /** + * 获取工单最新一条记录 + * @param array $data + * @return Conversation|\Illuminate\Database\Eloquent\Model|object|null + */ + public function firstByTicket(int $ticketId) + { + $conversation = Conversation::where('ticket_id',$ticketId) + ->orderBy('id','desc') + ->first(); + return $conversation; + } } \ No newline at end of file diff --git a/app/ticket/service/ConversationService.php b/app/ticket/service/ConversationService.php index c9cbd17..ea52002 100644 --- a/app/ticket/service/ConversationService.php +++ b/app/ticket/service/ConversationService.php @@ -4,7 +4,10 @@ namespace app\ticket\service; use app\common\model\User; use app\common\service\OssService; +use app\ticket\logic\CategorieLogic; use app\ticket\logic\ConversationLogic; +use app\ticket\logic\TicketLogic; +use app\ticket\model\Conversation; use config\constants\Constants; use support\Db; use support\exception\BusinessException; @@ -44,6 +47,39 @@ class ConversationService if (empty($data['content'])) { throw new BusinessException('消息内容不能为空'); } + + $conversation = (new ConversationLogic())->firstByTicket($data['ticket_id']); + $categorie= (new CategorieLogic())->find($data['categorie_id']); + $categorieName = isset($categorie['translation']) ? $categorie['translation']['name'] : ''; + + $notice = [ + 'code' => $data['code'], + 'category' => $categorieName, + 'content' => $data['content'], + 'reply' => '', + ]; + if (empty($conversation)) { + $email = 'app@hnxinyouhe.com'; + }else{ + $tiket = (new TicketLogic)->find($conversation['ticket_id']); + if($data['user_id'] != $tiket['user_id']){ + $email = User::find($tiket['user_id'])->value('email'); + }else{ + $conversationLast = Conversation::where('user_id', '=', $conversation['user_id']) + ->where('ticket_id', '=', $conversation['ticket_id']) + ->where('user_id', '!=', $conversation['user_id']) + ->orderBy('id', 'desc') + ->first(); + $email = User::find($conversationLast['user_id'])->value('email','app@hnxinyouhe.com'); + } + $notice['content'] = $tiket['content']; + $notice['reply'] = '
  • 最新回复：' . $data['content'] . '
    • '; + } + \app\common\utils\email\MailSend::send($email, '【XYH】新的工单提醒', replaceTpl($notice, 'work_order')); + + unset($data['categorie_id']); + unset($data['code']); + return (new ConversationLogic())->add($data); } catch (\Throwable $e) { throw $e; diff --git a/app/ticket/service/TicketService.php b/app/ticket/service/TicketService.php index 5d451be..d12c4e7 100644 --- a/app/ticket/service/TicketService.php +++ b/app/ticket/service/TicketService.php @@ -45,6 +45,7 @@ class TicketService try { $attachment = $data['attachment']??[]; $logic = new TicketLogic(); + $data['code'] = $logic::generateSimpleTicketNo(); $result = $logic->add($data); if(!empty($attachment)){ (new AttachmentLogic())->adds($attachment, $result->id, $data['user_id']); @@ -53,6 +54,8 @@ class TicketService $cleanContent = trim(preg_replace('/\s+/', ' ', strip_tags($data['content'] ?? ''))); $conversation = [ 'ticket_id' => $result->id, + 'categorie_id' => $data['categorie_id'], + 'code' => $data['code'], 'content' => $cleanContent, 'user_id' => $data['user_id'], 'attachment' => $data['attachment'], From 5c6fed4e404cfdc71acfe981c879c25cf37012bd Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 18:40:36 +0800 Subject: [PATCH 14/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/RoleController.php | 3 ++- app/admin/controller/UserController.php | 13 ++++++++++++ app/admin/logic/UserLogic.php | 20 ++++++++---------- app/admin/service/RoleService.php | 9 ++++++++ app/admin/service/UserService.php | 5 +++++ app/common/controller/PresetController.php | 24 ++++++++++++++++++++++ app/common/service/ResourceService.php | 13 ++++++++++++ app/common/utils/Tree.php | 3 ++- app/controller/IndexController.php | 2 ++ config/route.php | 2 ++ 10 files changed, 80 insertions(+), 14 deletions(-) diff --git a/app/admin/controller/RoleController.php b/app/admin/controller/RoleController.php index f73f07d..a08ff7e 100644 --- a/app/admin/controller/RoleController.php +++ b/app/admin/controller/RoleController.php @@ -32,7 +32,8 @@ class RoleController extends BaseController public function menuResource(Request $request) { try { - $data = $this->validate($this->service->getValidator(), $request->post(), 'allocation'); + // $data = $this->validate($this->service->getValidator(), $request->post(), 'allocation'); + $data = $request->post(); $res = $this->service->menuResource($request, $data); return $this->success($res); } catch (\Throwable $e) { diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index ae596e3..10a8d57 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -51,6 +51,19 @@ class UserController extends BaseController $data['corp_name'] = Corp::where('id', $data['corp_id'])->value('name'); $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); + + $data['role_ids'] = []; + $data['system_ids'] = []; + if (isset($data['roles']) && count($data['roles']) > 0) { + foreach ($data['roles'] as $role) { + $data['role_ids'][] = $role['id']; + } + } + if (isset($data['systems']) && count($data['systems']) > 0) { + foreach ($data['systems'] as $system) { + $data['system_ids'][] = $system['id']; + } + } return $data; } diff --git a/app/admin/logic/UserLogic.php b/app/admin/logic/UserLogic.php index e01da99..d70b6de 100644 --- a/app/admin/logic/UserLogic.php +++ b/app/admin/logic/UserLogic.php @@ -22,34 +22,30 @@ class UserLogic $systemIds = $data['system_ids'] ?? []; $userId = $data['user_id'] ?? 0; - if (empty($roleId)) { - return false; - } - Db::beginTransaction(); try { Db::table('user_roles')->where('user_id', $userId)->delete(); - if (!empty($roleIds)) { - $insertData = []; + if (count($roleIds) > 0) { + $insertDataRole = []; foreach ($roleIds as $roleId) { - $insertData[] = [ + $insertDataRole[] = [ 'role_id' => $roleId, 'user_id' => $userId ]; } - Db::table('user_roles')->insert($insertData); + Db::table('user_roles')->insert($insertDataRole); } Db::table('user_systems')->where('user_id', $userId)->delete(); - if (!empty($systemIds)) { - $insertData = []; + if (count($systemIds) > 0) { + $insertDataSystem = []; foreach ($systemIds as $systemId) { - $insertData[] = [ + $insertDataSystem[] = [ 'system_id' => $systemId, 'user_id' => $userId ]; } - Db::table('user_systems')->insert($insertData); + Db::table('user_systems')->insert($insertDataSystem); } Db::commit(); diff --git a/app/admin/service/RoleService.php b/app/admin/service/RoleService.php index af86a04..f2ee190 100644 --- a/app/admin/service/RoleService.php +++ b/app/admin/service/RoleService.php @@ -38,4 +38,13 @@ class RoleService { return (new RoleLogic)->updateRoleResources($data); } + + + public function getList() + { + $config['where']['status'] = 1; + $config['order']['sort'] = 'asc'; + $config['order']['id'] = 'asc'; + return $this->logicListAll($config); + } } \ No newline at end of file diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index d3d1175..d807db1 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -63,6 +63,11 @@ class UserService } $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'status', 'created_at']; + + $config['with']['roles'][] = 'id'; + $config['with']['roles'][] = 'name'; + $config['with']['systems'][] = 'id'; + $config['with']['systems'][] = 'name'; break; case 'show': $config['where']['id'] = $p['id']; diff --git a/app/common/controller/PresetController.php b/app/common/controller/PresetController.php index ad88a8f..569a895 100644 --- a/app/common/controller/PresetController.php +++ b/app/common/controller/PresetController.php @@ -2,11 +2,13 @@ namespace app\common\controller; +use app\admin\service\RoleService; use support\Request; use app\common\service\CorpService; use app\common\service\CorpFeishuAppService; use app\common\service\SystemsService; use app\common\service\UserService; +use support\Cache; class PresetController extends BaseController { @@ -61,4 +63,26 @@ class PresetController extends BaseController return $this->error($e->getMessage()); } } + + + public function roles() + { + try { + $result = (new RoleService)->getList(); + return $this->success($result, '获取角色列表'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } + + + public function cacheClear() + { + try { + Cache::clear(); + return $this->success([], '操作成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index c2469ef..c8ef178 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -110,4 +110,17 @@ class ResourceService $data = Tree::buildMenuTree($data->toArray()); return $data; } + + + public function beforeServiceStore($data, Request $request) + { + $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0; + return $data; + } + + public function beforeServiceUpdate($data, Request $request) + { + $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0; + return $data; + } } \ No newline at end of file diff --git a/app/common/utils/Tree.php b/app/common/utils/Tree.php index 478eb10..b831185 100644 --- a/app/common/utils/Tree.php +++ b/app/common/utils/Tree.php @@ -358,7 +358,8 @@ class Tree $authList[] = [ 'id' => $permission['id'], 'title' => $permission['name'] ?? '', - 'authMark' => $permission['code'] ?? '' + 'authMark' => $permission['code'] ?? '', + 'selected' => isset($permission['selected']) && $permission['selected'] ? true : false ]; } $menuItem['meta']['authList'] = $authList; diff --git a/app/controller/IndexController.php b/app/controller/IndexController.php index 3875843..e7ae182 100644 --- a/app/controller/IndexController.php +++ b/app/controller/IndexController.php @@ -119,6 +119,8 @@ class IndexController // ]; // \Webman\RedisQueue\Redis::send('perm-agt', $options); + $res = Cache::delete("user_resources_74_fdesk"); + return 22; } } \ No newline at end of file diff --git a/config/route.php b/config/route.php index 27ba099..d1fd613 100644 --- a/config/route.php +++ b/config/route.php @@ -58,6 +58,8 @@ Route::group('/common', function () { Route::any('/corps', [app\common\controller\PresetController::class, 'corps']); Route::any('/feishu/app', [app\common\controller\PresetController::class, 'feishuApp']); Route::any('/systems', [app\common\controller\PresetController::class, 'systems']); + Route::any('/roles', [app\common\controller\PresetController::class, 'roles']); + Route::any('/cache/clear', [app\common\controller\PresetController::class, 'cacheClear']); }); }); From 4280ec41a9d8672f5d17d53d96e3a7febcb67e75 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 18:42:06 +0800 Subject: [PATCH 15/48] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/traits/crud/CrudControllerTrait.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/common/traits/crud/CrudControllerTrait.php b/app/common/traits/crud/CrudControllerTrait.php index 5960d77..ca30ba3 100644 --- a/app/common/traits/crud/CrudControllerTrait.php +++ b/app/common/traits/crud/CrudControllerTrait.php @@ -62,7 +62,6 @@ trait CrudControllerTrait $res = $this->service->serviceStore($request, $data); return $this->success($res, '创建成功'); } catch (\Throwable $e) { - dpr($e); return $this->error($e->getMessage()); } } From b1715774305d6e6ffc700fef2a39c0db0616fe04 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 19:16:49 +0800 Subject: [PATCH 16/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/PresetController.php | 19 +++++++++++++++++++ app/common/service/UserService.php | 10 +++++----- config/route.php | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/common/controller/PresetController.php b/app/common/controller/PresetController.php index 569a895..37073c4 100644 --- a/app/common/controller/PresetController.php +++ b/app/common/controller/PresetController.php @@ -9,6 +9,7 @@ use app\common\service\CorpFeishuAppService; use app\common\service\SystemsService; use app\common\service\UserService; use support\Cache; +use app\common\service\PermService; class PresetController extends BaseController { @@ -85,4 +86,22 @@ class PresetController extends BaseController return $this->error($e->getMessage()); } } + + public function menus(Request $request) + { + try { + $uid = $request->user->uid; + $systemCode = $request->system_code; + $permService = new PermService(); + $menuTree = $permService->getMenuTree($uid, $systemCode); + $permissionCodes = $permService->getPermissionCodes($uid, $systemCode); + $result = [ + 'menu' => $menuTree, + 'permissions' => $permissionCodes + ]; + return $this->success($result, '获取菜单权限'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } } \ No newline at end of file diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 1d5dab4..cccda73 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -25,9 +25,9 @@ class UserService public function getUserInfo(int $uid, string $systemCode) { $user = $this->logic->userInfo($uid); - $permService = new PermService(); - $menuTree = $permService->getMenuTree($uid, $systemCode); - $permissionCodes = $permService->getPermissionCodes($uid, $systemCode); + // $permService = new PermService(); + // $menuTree = $permService->getMenuTree($uid, $systemCode); + // $permissionCodes = $permService->getPermissionCodes($uid, $systemCode); return [ 'user' => [ 'id' => $user->id, @@ -38,8 +38,8 @@ class UserService 'status' => $user->status, 'roles' => $user->roles->pluck('name') ], - 'menu' => $menuTree, - 'permissions' => $permissionCodes + // 'menu' => $menuTree, + // 'permissions' => $permissionCodes ]; } diff --git a/config/route.php b/config/route.php index d1fd613..7b93165 100644 --- a/config/route.php +++ b/config/route.php @@ -60,6 +60,7 @@ Route::group('/common', function () { Route::any('/systems', [app\common\controller\PresetController::class, 'systems']); Route::any('/roles', [app\common\controller\PresetController::class, 'roles']); Route::any('/cache/clear', [app\common\controller\PresetController::class, 'cacheClear']); + Route::any('/menus', [app\common\controller\PresetController::class, 'menus']); }); }); From c4249dd018cce50d9ec2e8914f06eeb66c0a377f Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Wed, 13 Aug 2025 19:37:52 +0800 Subject: [PATCH 17/48] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=AF=E5=88=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/CorpFeishuAppLogic.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/common/logic/CorpFeishuAppLogic.php b/app/common/logic/CorpFeishuAppLogic.php index 59838c3..2613c6a 100644 --- a/app/common/logic/CorpFeishuAppLogic.php +++ b/app/common/logic/CorpFeishuAppLogic.php @@ -14,4 +14,10 @@ class CorpFeishuAppLogic */ protected string $modelClass = CorpFeishuApp::class; + + public function getFeishuApp($corpId, $systemId) + { + return CorpFeishuApp::where('corp_id', $corpId)->where('system_id', $systemId)->first(['id', 'corp_id', 'name', 'app_id', 'r_url', 'state']); + } + } \ No newline at end of file From af4dd3ff855fce9c2009c86ec1dbdd5eaeb5a03b Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 09:34:18 +0800 Subject: [PATCH 18/48] =?UTF-8?q?=E4=B8=8A=E7=BA=A7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index adbfd95..33e8f92 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -71,7 +71,7 @@ class UserService $config['where']['id'] = $p['id']; } - $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'status', 'created_at']; + $config['fields'] = ['id','sn', 'name', 'email', 'sex', 'phone', 'avatar', 'corp_id', 'country_id', 'position', 'report_to', 'status', 'created_at']; break; case 'show': $config['where']['id'] = $p['id']; From 879a9ee4aa3a5d3d7c3944d7c4534d7bb109d504 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 09:41:28 +0800 Subject: [PATCH 19/48] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/service/CustomerService.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index c41aace..2862088 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -36,6 +36,7 @@ class CustomerService $follow = $params['follow'] ?? ''; $follow_last = $params['follow_last'] ?? ''; $tagId = $params['tag_id'] ?? []; + $countryId = $params['country_id'] ?? ''; $where = []; $user_id =$params['user_id']; @@ -49,6 +50,9 @@ class CustomerService } $where[] = ['status', 1]; + if (!empty($countryId)){ + $where[] = ['country_id', $countryId]; + } $grade = []; if (!Util::isEmpty($follow) && $follow == 0) { From a59ed51f6f58ffc24e3a816f447d5abc30635ad1 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 10:15:38 +0800 Subject: [PATCH 20/48] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/UserService.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index d955de0..ad7aa5f 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -37,6 +37,7 @@ class UserService // $permService = new PermService(); // $menuTree = $permService->getMenuTree($uid, $systemCode); // $permissionCodes = $permService->getPermissionCodes($uid, $systemCode); + $corp_name = Corp::where('abbr', $user->corp_id)->value('name'); return [ 'user' => [ 'id' => $user->id, @@ -45,7 +46,11 @@ class UserService 'phone' => $user->phone, 'email' => $user->email, 'status' => $user->status, - 'roles' => $user->roles->pluck('name') + 'roles' => $user->roles->pluck('name'), + 'sex' => $user->sex, + 'sn' => $user->sn, + 'corp_id' => $user->corp_id, + 'corp_name' => $corp_name, ], // 'menu' => $menuTree, // 'permissions' => $permissionCodes From 2233fb4d6b7e2dda2f437555a6b1b076766a50fd Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 10:33:45 +0800 Subject: [PATCH 21/48] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 1 + config/route.php | 1 + 2 files changed, 2 insertions(+) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index 7a7f6eb..ddafa85 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -48,6 +48,7 @@ class UserController extends BaseController { try { $data = $this->validate($this->service->getValidator(), $request->post(), 'update'); + $data['id'] = $data['id']??$request->user->uid; $res = $this->service->serviceUpdate($request, $data); return $this->success([], '更新成功'); } catch (\Throwable $e) { diff --git a/config/route.php b/config/route.php index 3da8dd6..9cc5c85 100644 --- a/config/route.php +++ b/config/route.php @@ -121,6 +121,7 @@ Route::group('/admin', function () { Route::any('/list', [app\admin\controller\UserController::class, 'index']); Route::any('/show', [app\admin\controller\UserController::class, 'show']); Route::any('/update', [app\admin\controller\UserController::class, 'update']); + Route::any('/edit', [app\admin\controller\UserController::class, 'edit']); Route::any('/authorize', [app\admin\controller\UserController::class, 'authorize']); Route::any('/set/resources', [app\admin\controller\UserController::class, 'updateResources']); Route::any('/update/password', [app\admin\controller\UserController::class, 'savePassword']); From 311e40760186e7109ec68898f573cabc5898fa3d Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Thu, 14 Aug 2025 10:55:46 +0800 Subject: [PATCH 22/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83&=E8=B0=83=E6=95=B4=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 4 ++-- app/common/utils/scaffold/Generate.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index 10a8d57..a080444 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -76,7 +76,7 @@ class UserController extends BaseController public function authorize(Request $request) { try { - $data = $this->validate($this->service->getValidator(), $request->post(), 'authorize'); + $data = $request->post(); $res = $this->service->authorize($request, $data); return $this->success([], '分配成功'); } catch (\Throwable $e) { @@ -93,7 +93,7 @@ class UserController extends BaseController public function updateResources(Request $request) { try { - $data = $this->validate($this->service->getValidator(), $request->post(), 'updateResources'); + $data = $request->post(); $res = $this->service->updateResources($request, $data); return $this->success([], '分配成功'); } catch (\Throwable $e) { diff --git a/app/common/utils/scaffold/Generate.php b/app/common/utils/scaffold/Generate.php index 753a9cf..eb82025 100644 --- a/app/common/utils/scaffold/Generate.php +++ b/app/common/utils/scaffold/Generate.php @@ -156,8 +156,11 @@ class Generate protected function deleteFileIfExists($path) { if (file_exists($path)) { - unlink($path); - echo "删除已存在文件: {$path} \n"; + "文件: {$path} 已存在，核对后手动删除。\n"; + return; + + // unlink($path); + // echo "删除已存在文件: {$path} \n"; } } From 962f89189840e51a660e252edcf9f074d292a113 Mon Sep 17 00:00:00 2001 From: chenlan <18339827479@163.com> Date: Thu, 14 Aug 2025 11:06:54 +0800 Subject: [PATCH 23/48] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9D=97=E5=84=BF=E6=B3=A8=E9=87=8A=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/logic/PermLogic.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/common/logic/PermLogic.php b/app/common/logic/PermLogic.php index d2e4505..808cb15 100644 --- a/app/common/logic/PermLogic.php +++ b/app/common/logic/PermLogic.php @@ -23,12 +23,16 @@ class PermLogic } $all = collect(); - - // 合并角色资源，排除不需要权限认证的资源 + // 遍历用户的所有角色，合并每个角色所拥有的资源 foreach ($user->roles as $role) { $all = $all->merge( + // 过滤当前角色的资源列表 $role->resources->filter(function ($resource) use($system) { - // 只保留需要权限认证的资源（或公共资源） + // 资源过滤条件： + // 1. !$resource->no_auth：资源需要权限认证（排除公共资源） + // 2. 系统匹配条件： + // - $system->id == $resource->system_id：资源属于当前系统 + // - $resource->system_id == 0：资源为全局公共资源（所有系统可用） return !$resource->no_auth && ($system->id == $resource->system_id || $resource->system_id == 0); }) ); From d08af0973b142b86da97b21406c5caec749c5c09 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Thu, 14 Aug 2025 11:14:22 +0800 Subject: [PATCH 24/48] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8D=E5=BC=BA=E5=88=B6=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/ResourceService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index c8ef178..b58ff84 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -115,12 +115,14 @@ class ResourceService public function beforeServiceStore($data, Request $request) { $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0; + $data['system_id'] = $data['system_id'] != '' ? $data['system_id'] : 0; return $data; } public function beforeServiceUpdate($data, Request $request) { $data['parent_id'] = $data['parent_id'] != '' ? $data['parent_id'] : 0; + $data['system_id'] = $data['system_id'] != '' ? $data['system_id'] : 0; return $data; } } \ No newline at end of file From 0b1bcc94e9904af80b34f9572416cc5dff2b9675 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 13:56:18 +0800 Subject: [PATCH 25/48] =?UTF-8?q?=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crmAdmin/service/CustomerService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 1a94f92..7b74e16 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -436,7 +436,7 @@ class CustomerService $id = $params['id']; $follow = Follow:: where('customer_id', $id) - ->first(); + ->get(); $ossservice = new OssService(); foreach ($follow as $item) { From 2bbe7935cae5e3e724e7f680ba0f3cbbf15b17a6 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 14:03:38 +0800 Subject: [PATCH 26/48] =?UTF-8?q?=E8=B7=9F=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crmAdmin/service/CustomerService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 7b74e16..1bb22f4 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -440,7 +440,7 @@ class CustomerService $ossservice = new OssService(); foreach ($follow as $item) { - $item['picture_full'] = $item->picture??$ossservice->generatePrivateUrl($item->picture); + $item['picture_full'] = empty($item->picture)?'':$ossservice->generatePrivateUrl($item->picture); } return $follow; From 312c7706f99e92063b36a29c118a3a56cd204f7a Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 14:11:08 +0800 Subject: [PATCH 27/48] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/route.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/route.php b/config/route.php index 9cc5c85..9c33c32 100644 --- a/config/route.php +++ b/config/route.php @@ -157,6 +157,7 @@ Route::group('/admin', function () { Route::any('/transfer', [app\crmAdmin\controller\CustomerController::class, 'transfer']); Route::any('/detail', [app\crmAdmin\controller\CustomerController::class, 'detail']); Route::any('/delete', [app\crmAdmin\controller\CustomerController::class, 'delete']); + Route::any('/cede', [app\crm\controller\CustomerController::class, 'cede']); Route::any('/follow', [app\crmAdmin\controller\CustomerController::class, 'follow']); }); }); From d90a8b05ce55365b9b953539cb95416d9360f7ba Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 15:28:15 +0800 Subject: [PATCH 28/48] =?UTF-8?q?=E7=BB=84=E5=91=98=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/command/CustomerCodeCommand.php | 3 ++- app/common/model/CrmCustomer.php | 27 ++++++++++++++++++++++++ app/common/service/UserService.php | 6 ++++++ app/crmAdmin/service/CustomerService.php | 4 +++- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/app/command/CustomerCodeCommand.php b/app/command/CustomerCodeCommand.php index 2d3e447..a82ec0f 100644 --- a/app/command/CustomerCodeCommand.php +++ b/app/command/CustomerCodeCommand.php @@ -44,7 +44,8 @@ class CustomerCodeCommand extends SymfonyCommand $code = 'CM' . $unique; } - $obtain = $customer->created_at>strtotime('2025-07-29')?$customer->created_at:strtotime('2025-07-29'); + $created_at = $customer->created_at->getTimestamp(); + $obtain = $created_at > strtotime('2025-07-29')?$created_at:strtotime('2025-07-29'); $customer->code = $code; $customer->obtain = $obtain; diff --git a/app/common/model/CrmCustomer.php b/app/common/model/CrmCustomer.php index 49446e6..f050186 100644 --- a/app/common/model/CrmCustomer.php +++ b/app/common/model/CrmCustomer.php @@ -46,4 +46,31 @@ class CrmCustomer extends Model * 不允许自动填充模型字段 */ protected $guarded = []; + + protected static function booted() + { + static::saved(function ($customer) { + if (empty($customer->code)) { + $customer->code = self::generateCustomerCode($customer); + // 使用saveQuietly避免递归调用 + $customer->saveQuietly(); + } + }); + } + + public static function generateCustomerCode($customer) + { + // 生成唯一16位code，CM+14位 + $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 14)); + $code = 'CM' . date('Ymd') .$unique; + return $code; + } + + // 静默保存方法，不触发事件 + public function saveQuietly(array $options = []) + { + return static::withoutEvents(function () use ($options) { + return $this->save($options); + }); + } } \ No newline at end of file diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index ad7aa5f..3712f20 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -9,6 +9,7 @@ use app\common\traits\crud\CrudLogicTrait; use app\common\traits\crud\CrudServiceTrait; use app\common\utils\CrudUtil; use app\crm\model\Country; +use app\crm\model\Customer; use support\exception\BusinessException; use support\Request; @@ -136,6 +137,11 @@ class UserService $page = (int)$request->get('current', 1); $result = $this->logicList($config, $limit, $page); } + + foreach ($result as &$data){ + $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); + } + return $this->postProcess('List', $result); } diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 1bb22f4..dc08f0e 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -105,7 +105,9 @@ class CustomerService if (!Util::isEmpty($keyword)) { $query->where(function ($query) use ($keyword) { $query->where('contacts', 'like', "%{$keyword}%") - ->orWhere('phone', 'like', "%{$keyword}%"); + ->orWhere('phone', 'like', "%{$keyword}%") + ->orWhere('WhatsApp', 'like', "%{$keyword}%") + ->orWhere('code', 'like', "%{$keyword}%"); }); } if (!Util::isEmpty($grade)) { From 4c89b3999cb5137a88c050ccc1e6ff766f195631 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 15:50:57 +0800 Subject: [PATCH 29/48] =?UTF-8?q?=E7=94=9F=E6=88=90code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/UserService.php | 4 ++++ app/crm/model/Customer.php | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index 3712f20..f3c28d1 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -140,6 +140,10 @@ class UserService foreach ($result as &$data){ $data['customer_count'] = Customer::where('user_id', $data['id'])->count(); + unset($data['password']); + unset($data['open_id']); + unset($data['tenant_key']); + unset($data['union_id']); } return $this->postProcess('List', $result); diff --git a/app/crm/model/Customer.php b/app/crm/model/Customer.php index af5c571..ff0287d 100644 --- a/app/crm/model/Customer.php +++ b/app/crm/model/Customer.php @@ -79,4 +79,31 @@ class Customer extends Model { return $this->belongsTo(User::class, 'user_id', 'id'); } + + protected static function booted() + { + static::saved(function ($customer) { + if (empty($customer->code)) { + $customer->code = self::generateCustomerCode($customer); + // 使用saveQuietly避免递归调用 + $customer->saveQuietly(); + } + }); + } + + public static function generateCustomerCode($customer) + { + // 生成唯一16位code，CM+14位 + $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 14)); + $code = 'CM' . date('Ymd') .$unique; + return $code; + } + + // 静默保存方法，不触发事件 + public function saveQuietly(array $options = []) + { + return static::withoutEvents(function () use ($options) { + return $this->save($options); + }); + } } \ No newline at end of file From ae189b49d9e06d81a1c03e599fdf05340cd96deb Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 15:56:10 +0800 Subject: [PATCH 30/48] =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/CrmCustomer.php | 2 +- app/crm/model/Customer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/model/CrmCustomer.php b/app/common/model/CrmCustomer.php index f050186..bc439db 100644 --- a/app/common/model/CrmCustomer.php +++ b/app/common/model/CrmCustomer.php @@ -61,7 +61,7 @@ class CrmCustomer extends Model public static function generateCustomerCode($customer) { // 生成唯一16位code，CM+14位 - $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 14)); + $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 6)); $code = 'CM' . date('Ymd') .$unique; return $code; } diff --git a/app/crm/model/Customer.php b/app/crm/model/Customer.php index ff0287d..326eb72 100644 --- a/app/crm/model/Customer.php +++ b/app/crm/model/Customer.php @@ -94,7 +94,7 @@ class Customer extends Model public static function generateCustomerCode($customer) { // 生成唯一16位code，CM+14位 - $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 14)); + $unique = strtoupper(substr(md5($customer->id . microtime(true) . mt_rand(1000, 9999)), 8, 6)); $code = 'CM' . date('Ymd') .$unique; return $code; } From aa9c75853ce3cb25126ea3fa9b064fc2a1384ffd Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 16:05:51 +0800 Subject: [PATCH 31/48] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/service/CustomerService.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index 2862088..29c84ce 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -88,7 +88,9 @@ class CustomerService if (!Util::isEmpty($keyword)) { $query->where(function ($query) use ($keyword) { $query->where('contacts', 'like', "%{$keyword}%") - ->orWhere('phone', 'like', "%{$keyword}%"); + ->orWhere('phone', 'like', "%{$keyword}%") + ->orWhere('WhatsApp', 'like', "%{$keyword}%") + ->orWhere('code', 'like', "%{$keyword}%"); }); } if (!Util::isEmpty($grade)) { From 1559dc47e7f759b285f780dc565560670d7ea934 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 17:22:03 +0800 Subject: [PATCH 32/48] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 4 +++- app/common/validate/UserValidate.php | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index 75c25d1..9cf7d17 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -29,8 +29,10 @@ class UserController extends BaseController public function savePassword(Request $request) { try { - $data = $this->validate($this->service->getValidator(), $request->post(), 'password'); $data = $request->all(); + if(empty($data['password'])){ + return $this->error('密码不能为空'); + } $result = $this->service->savePassword($request,$data);; return $this->success($result, '编辑成功'); } catch (\Throwable $e) { diff --git a/app/common/validate/UserValidate.php b/app/common/validate/UserValidate.php index 6330cb5..dcdaa9b 100644 --- a/app/common/validate/UserValidate.php +++ b/app/common/validate/UserValidate.php @@ -56,7 +56,6 @@ class UserValidate extends Validate 'upwd_login' => ['account' => 'require|checkAccount', 'password'], 'feishu_auth' => ['corp_abbr', 'system_code', 'login_type'], 'feishu_login' => ['feishu_code'], - 'password' => ['password'], ]; /** From fa7fdc3787be4628aaf90e0f4b434fabd3521597 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 17:39:34 +0800 Subject: [PATCH 33/48] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 17 ++++++++++++++++- app/admin/service/UserService.php | 9 +++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index 9cf7d17..5065f54 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -18,7 +18,22 @@ class UserController extends BaseController { $this->service = new UserService(); } - + /** + * 更新 + * + * @param Request $request 请求对象 + * @return mixed 返回更新成功的数据或信息 + */ + public function update(Request $request) + { + try { + $data = $request->post(); + $res = $this->service->serviceUpdate($request, $data); + return $this->success([], '更新成功'); + } catch (\Throwable $e) { + return $this->error($e->getMessage()); + } + } /** * 修改密码 diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 1ef1a43..75b47b1 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -32,6 +32,15 @@ class UserService return new $this->validator; } + /** 更新 */ + public function serviceUpdateUser(Request $request, array $data = []) + { + $data = $this->preProcess('Update', $data, $request); + $config = $this->buildQueryConfig($request, 'update'); + $updated = $this->logicUpdateBy($config, $data); + return $this->postProcess('Update', $data); + } + /** 更新 */ public function serviceUpdate(Request $request, array $data = []) { From a8ec6889d0aef99533f43741462be60dbb824bb3 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 17:43:19 +0800 Subject: [PATCH 34/48] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index 5065f54..b8eef18 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -28,7 +28,7 @@ class UserController extends BaseController { try { $data = $request->post(); - $res = $this->service->serviceUpdate($request, $data); + $res = $this->service->serviceUpdateUser($request, $data); return $this->success([], '更新成功'); } catch (\Throwable $e) { return $this->error($e->getMessage()); From b6b7407c39ce530ae8c8656d541f96e967270e8b Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 17:46:52 +0800 Subject: [PATCH 35/48] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crmAdmin/service/CustomerService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index dc08f0e..e079a03 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -127,6 +127,7 @@ class CustomerService if (!$export) { foreach ($customer as &$item) { $item = $this->getCustomer($item); + $item['desc_collect'] = $item['desc_collect'] ?? ''; $item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']); if ($seas == 'seas' || $scene == 'seas') { $item['seas_time'] = time() - strtotime($item['deleted_at']); From 25ab9cafd51a1ca098ac2596d892f65119c23779 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Thu, 14 Aug 2025 17:48:24 +0800 Subject: [PATCH 36/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/ResourceService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index b58ff84..dc0e4e1 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -46,6 +46,7 @@ class ResourceService $config['order']['id'] = 'asc'; break; case 'menuList': + $config['where']['system_id'] = ['in', [0, $p['system_id']]]; $config['where']['status'] = 1; $config['where']['type'] = ['!=', 'permission']; $config['order']['sort'] = 'asc'; From 9f8d6346110cef49b6431f3661a798b72c7f2413 Mon Sep 17 00:00:00 2001 From: "mzl@hnxinyouhe.com" Date: Thu, 14 Aug 2025 18:03:22 +0800 Subject: [PATCH 37/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/ResourceService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/service/ResourceService.php b/app/common/service/ResourceService.php index dc0e4e1..ad3f85b 100644 --- a/app/common/service/ResourceService.php +++ b/app/common/service/ResourceService.php @@ -41,12 +41,12 @@ class ResourceService $config['model'] = $this->modelClass; switch ($scene) { case 'default': + $config['where']['system_id'] = ['in', [0, $p['system_id']]]; $config['where']['status'] = 1; $config['order']['sort'] = 'asc'; $config['order']['id'] = 'asc'; break; case 'menuList': - $config['where']['system_id'] = ['in', [0, $p['system_id']]]; $config['where']['status'] = 1; $config['where']['type'] = ['!=', 'permission']; $config['order']['sort'] = 'asc'; From 060d464f093ed383635420cd7e853b78bb03e189 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 18:07:34 +0800 Subject: [PATCH 38/48] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/UserController.php | 2 +- app/admin/service/UserService.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/admin/controller/UserController.php b/app/admin/controller/UserController.php index b8eef18..25f2385 100644 --- a/app/admin/controller/UserController.php +++ b/app/admin/controller/UserController.php @@ -64,7 +64,7 @@ class UserController extends BaseController public function edit(Request $request) { try { - $data = $this->validate($this->service->getValidator(), $request->post(), 'update'); + $data = $request->post(); $data['id'] = $data['id']??$request->user->uid; $res = $this->service->serviceUpdate($request, $data); return $this->success([], '更新成功'); diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 75b47b1..4d23710 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -44,6 +44,8 @@ class UserService /** 更新 */ public function serviceUpdate(Request $request, array $data = []) { + unset($data['roles']); + unset($data['corp_name']); $data = $this->preProcess('Update', $data, $request); $config = $this->buildQueryConfig($request, 'edit'); $updated = $this->logicUpdateBy($config, $data); From a4bc1e8e103fe57a1d38b84cedbd00a7f0722594 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 19:11:00 +0800 Subject: [PATCH 39/48] 1 --- app/crm/controller/CustomerController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/crm/controller/CustomerController.php b/app/crm/controller/CustomerController.php index b00af0d..3b6e8ec 100644 --- a/app/crm/controller/CustomerController.php +++ b/app/crm/controller/CustomerController.php @@ -560,7 +560,7 @@ class CustomerController extends BaseController return $this->error( trans('user_none')); } - $query= Customer::whereIn('id',explode(',',$customerId)); + $query= Customer::withTrashed()->whereIn('id',explode(',',$customerId)); try { $customer = $query->get(); @@ -579,6 +579,8 @@ class CustomerController extends BaseController $inquiryLog->save(); } } + + $item->restore(); } $data = [ From c85a1701142e424549279f246eb526ea1878ba5f Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 19:23:16 +0800 Subject: [PATCH 40/48] =?UTF-8?q?=E5=85=AC=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crmAdmin/service/CustomerService.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index e079a03..504e478 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -114,9 +114,12 @@ class CustomerService $query->whereIn('grade', $grade); } - if ($recycle == 'recycle' || $scene == 'recycle' || $seas == 'seas' || $scene == 'seas' || $scene == 'audit') { + if ($recycle == 'recycle' || $scene == 'recycle' || $scene == 'audit') { $query->onlyTrashed(); } + if ($seas == 'seas' || $scene == 'seas') { + $query->withTrashed(); + } if (!$export) { $customer = $query->orderBy('id', 'desc')->paginate($perPage, ['*'], 'page', $page); From 04d92124f18f98301ba39c756fc1fe53b878d254 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 19:28:05 +0800 Subject: [PATCH 41/48] 1 --- app/crmAdmin/service/CustomerService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 504e478..159afbd 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -133,7 +133,7 @@ class CustomerService $item['desc_collect'] = $item['desc_collect'] ?? ''; $item['follow_next'] = empty($item['follow_next'])?'':date('Y-m-d H:i:s', $item['follow_next']); if ($seas == 'seas' || $scene == 'seas') { - $item['seas_time'] = time() - strtotime($item['deleted_at']); + $item['seas_time'] = time() - (empty($item['deleted_at'])?strtotime($item['updated_at']):strtotime($item['deleted_at'])); } if ($scene == 'audit') { //审核时查询举报人姓名 $customerHis = CustomerHis::where('customer_id', $item->id)->orderBy('id', 'desc')->first(['user_his']); From 5ae97c9feed838f8055a539b8d106e45dde44aed Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 19:49:20 +0800 Subject: [PATCH 42/48] =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/UserController.php | 2 +- app/common/service/UserService.php | 4 ++++ app/crm/service/CustomerService.php | 8 ++++++++ app/crmAdmin/service/CustomerService.php | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/common/controller/UserController.php b/app/common/controller/UserController.php index d4fe0f4..f49fba0 100644 --- a/app/common/controller/UserController.php +++ b/app/common/controller/UserController.php @@ -46,7 +46,7 @@ class UserController extends BaseController public function resignMember(Request $request) { try { - $userId = $request->post('user_id'); + $userId = $request->get('user_id'); if(empty($userId)){ return $this->error('组员id不能为空'); } diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index f3c28d1..fef0f63 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -185,6 +185,10 @@ class UserService // $config['where']['status'] = 1; // 关键字 $config['order']['id'] = 'desc'; + if (isset($p['status']) && $p['status']) { + $config['where']['status'] = $p['status']; + } + $config['dataLimit']['type'] = 'relation'; $config['dataLimit']['userId'] = $request->user->uid; $config['dataLimit']['userField'] = 'report_to'; diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index 29c84ce..2096b5a 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -89,6 +89,7 @@ class CustomerService $query->where(function ($query) use ($keyword) { $query->where('contacts', 'like', "%{$keyword}%") ->orWhere('phone', 'like', "%{$keyword}%") + ->orWhere('email', 'like', "%{$keyword}%") ->orWhere('WhatsApp', 'like', "%{$keyword}%") ->orWhere('code', 'like', "%{$keyword}%"); }); @@ -154,9 +155,16 @@ class CustomerService switch ($scene) { case 'index': $config['where']['status'] = 1; // 关键字 + if (isset($p['user_id']) && $p['user_id']) { + $config['where']['user_id'] = $p['user_id']; + } // 关键字 if (isset($p['keyword']) && $p['keyword']) { $k = '%' . $p['keyword'] . '%'; $config['where']['contacts'] = ['like', $k]; + $config['where']['phone'] = ['like', $k]; + $config['where']['email'] = ['like', $k]; + $config['where']['WhatsApp'] = ['like', $k]; + $config['where']['code'] = ['like', $k]; } $config['order']['id'] = 'desc'; $config['dataLimit']['type'] = 'relation'; diff --git a/app/crmAdmin/service/CustomerService.php b/app/crmAdmin/service/CustomerService.php index 159afbd..074f341 100644 --- a/app/crmAdmin/service/CustomerService.php +++ b/app/crmAdmin/service/CustomerService.php @@ -106,6 +106,7 @@ class CustomerService $query->where(function ($query) use ($keyword) { $query->where('contacts', 'like', "%{$keyword}%") ->orWhere('phone', 'like', "%{$keyword}%") + ->orWhere('email', 'like', "%{$keyword}%") ->orWhere('WhatsApp', 'like', "%{$keyword}%") ->orWhere('code', 'like', "%{$keyword}%"); }); From 60843f0621e5d951ac5feadb3494f52eaf64d4e3 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 19:52:23 +0800 Subject: [PATCH 43/48] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/service/UserService.php b/app/common/service/UserService.php index fef0f63..53507b2 100644 --- a/app/common/service/UserService.php +++ b/app/common/service/UserService.php @@ -153,7 +153,7 @@ class UserService public function resignMember(Request $request) { $uid = $request->user->uid; - $userId = $request->post('user_id'); + $userId = $request->get('user_id'); $user = User::find($userId); if ($user->report_to != $uid) { throw new BusinessException('禁止操作非组员'); From 2e94a17d111b7bd1c3dc5fe0406a36547359888a Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Thu, 14 Aug 2025 20:02:40 +0800 Subject: [PATCH 44/48] =?UTF-8?q?=E7=BB=84=E5=91=98=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/crm/service/CustomerService.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php index 2096b5a..0573972 100644 --- a/app/crm/service/CustomerService.php +++ b/app/crm/service/CustomerService.php @@ -160,11 +160,11 @@ class CustomerService } // 关键字 if (isset($p['keyword']) && $p['keyword']) { $k = '%' . $p['keyword'] . '%'; - $config['where']['contacts'] = ['like', $k]; - $config['where']['phone'] = ['like', $k]; - $config['where']['email'] = ['like', $k]; - $config['where']['WhatsApp'] = ['like', $k]; - $config['where']['code'] = ['like', $k]; + $config['orWhere'][] = ['contacts','like', $k]; + $config['orWhere'][] = ['phone','like', $k]; + $config['orWhere'][] = ['email','like', $k]; + $config['orWhere'][] = ['WhatsApp','like', $k]; + $config['orWhere'][] = ['code','like', $k]; } $config['order']['id'] = 'desc'; $config['dataLimit']['type'] = 'relation'; From 5642089c62a163707a369706d0c7460fd6ee4943 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 18 Aug 2025 10:38:41 +0800 Subject: [PATCH 45/48] =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ticket/service/ConversationService.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/ticket/service/ConversationService.php b/app/ticket/service/ConversationService.php index ea52002..fef9eab 100644 --- a/app/ticket/service/ConversationService.php +++ b/app/ticket/service/ConversationService.php @@ -59,7 +59,9 @@ class ConversationService 'reply' => '', ]; if (empty($conversation)) { - $email = 'app@hnxinyouhe.com'; + //$email = 'app@hnxinyouhe.com'; //公共邮箱 + $email = 'tuotuo@hnxinyouhe.com'; //范彩凤 + $email = 'beimanr@hnxinyouhe.com'; //范彩凤 }else{ $tiket = (new TicketLogic)->find($conversation['ticket_id']); if($data['user_id'] != $tiket['user_id']){ From ad619362b6feea30498cdd226d1b808771a232da Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 18 Aug 2025 11:20:35 +0800 Subject: [PATCH 46/48] =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ticket/logic/CategorieLogic.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/ticket/logic/CategorieLogic.php b/app/ticket/logic/CategorieLogic.php index f9f1014..7eefaed 100644 --- a/app/ticket/logic/CategorieLogic.php +++ b/app/ticket/logic/CategorieLogic.php @@ -25,9 +25,9 @@ class CategorieLogic public function find($id) { - return Categorie::with('translation') - ->where('status',1) - ->where('locale', locale()) + return Categorie::with(['translation' => function ($query) { + $query->where('locale', locale()); + }])->where('status', 1) ->find($id); } From c32e768e411679d101936bbaaddedb2d552d8586 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 18 Aug 2025 11:32:33 +0800 Subject: [PATCH 47/48] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ticket/service/ConversationService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/ticket/service/ConversationService.php b/app/ticket/service/ConversationService.php index fef9eab..fdd963b 100644 --- a/app/ticket/service/ConversationService.php +++ b/app/ticket/service/ConversationService.php @@ -49,11 +49,12 @@ class ConversationService } $conversation = (new ConversationLogic())->firstByTicket($data['ticket_id']); - $categorie= (new CategorieLogic())->find($data['categorie_id']); + $ticket = (new TicketLogic())->find($data['ticket_id']); + $categorie= (new CategorieLogic())->find($ticket['categorie_id']); $categorieName = isset($categorie['translation']) ? $categorie['translation']['name'] : ''; $notice = [ - 'code' => $data['code'], + 'code' => $ticket['code'], 'category' => $categorieName, 'content' => $data['content'], 'reply' => '', From d8b80aefeca274f2e35c820c5e19a565fc459d8c Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 18 Aug 2025 13:57:46 +0800 Subject: [PATCH 48/48] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ticket/service/ConversationService.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/ticket/service/ConversationService.php b/app/ticket/service/ConversationService.php index fdd963b..4417284 100644 --- a/app/ticket/service/ConversationService.php +++ b/app/ticket/service/ConversationService.php @@ -59,21 +59,21 @@ class ConversationService 'content' => $data['content'], 'reply' => '', ]; + //$emailDefault = 'app@hnxinyouhe.com'; //公共邮箱 + $emailDefault = 'tuotuo@hnxinyouhe.com'; //范彩凤 if (empty($conversation)) { - //$email = 'app@hnxinyouhe.com'; //公共邮箱 - $email = 'tuotuo@hnxinyouhe.com'; //范彩凤 - $email = 'beimanr@hnxinyouhe.com'; //范彩凤 + $email = $emailDefault; }else{ $tiket = (new TicketLogic)->find($conversation['ticket_id']); if($data['user_id'] != $tiket['user_id']){ $email = User::find($tiket['user_id'])->value('email'); }else{ - $conversationLast = Conversation::where('user_id', '=', $conversation['user_id']) - ->where('ticket_id', '=', $conversation['ticket_id']) - ->where('user_id', '!=', $conversation['user_id']) + $conversationLast = Conversation::where('ticket_id', '=', $conversation['ticket_id']) + ->where('user_id', '!=', $data['user_id']) ->orderBy('id', 'desc') ->first(); - $email = User::find($conversationLast['user_id'])->value('email','app@hnxinyouhe.com'); + + $email = (!empty($conversationLast['user_id']))?User::find($conversationLast['user_id'])->value('email',$emailDefault):$emailDefault; } $notice['content'] = $tiket['content']; $notice['reply'] = '
  • 最新回复：' . $data['content'] . '
    • ';