gx

lyh
app/Http/Controllers/Aside/Mail/MailController.php
app/Http/Controllers/Aside/User/ProjectRoleController.php
app/Http/Controllers/Aside/User/ProjectUserController.php
app/Http/Controllers/Bside/User/ProjectRoleController.php
app/Http/Logic/Aside/Mail/MailLogic.php
app/Http/Logic/Aside/User/ProjectRoleLogic.php
app/Http/Logic/Aside/User/UserLogic.php
app/Http/Logic/Bside/User/RoleLogic.php
app/Http/Requests/Aside/User/ProjectRoleRequest.php
app/Models/User/ProjectRole.php
routes/aside.php
--- a/app/Http/Controllers/Aside/Mail/MailController.php
查看文件 @106e828
+++ b/app/Http/Controllers/Aside/Mail/MailController.php
查看文件 @106e828
@@ -22,6 +22,18 @@ class MailController extends BaseController
     }
     /**
+     * @remark :添加站内信获取用户列表
+     * @name   :getUser
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:34
+     */
+    public function getUser(MailLogic $mailLogic){
+        $list = $mailLogic->getUserList($this->map);
+        $this->response('列表',Code::SUCCESS,$list);
+    }
+
+    /**
      * @param MailLogic $mailLogic
      * @name   :info
      * @author :lyh
--- a/app/Http/Controllers/Aside/User/ProjectRoleController.php
查看文件 @106e828
+++ b/app/Http/Controllers/Aside/User/ProjectRoleController.php
查看文件 @106e828
@@ -6,7 +6,10 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\ProjectRoleLogic;
 use App\Http\Requests\Aside\User\ProjectRoleRequest;
+use App\Models\Manage\Manage;
+use App\Models\Project\Project;
 use App\Models\User\ProjectRole as ProjectRoleModel;
+use App\Models\User\User as UserModel;
 /**
  * @remark :b端用户角色设置管理
@@ -27,6 +30,18 @@ class ProjectRoleController extends BaseController
         $roleModel = new ProjectRoleModel();
         $filed = ['id','name','project_id','operator_id','status','created_at','updated_at'];
         $lists = $roleModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
+        if(!empty($lists)){
+            foreach ($lists as $k => $v){
+                if($v['type'] == 1){
+                    $userModel = new UserModel();
+                    $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                }else{
+                    $managerModel = new Manage();
+                    $lists['list'][$k]['operator_name'] = $managerModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                }
+                $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
     }
--- a/app/Http/Controllers/Aside/User/ProjectUserController.php
查看文件 @106e828
+++ b/app/Http/Controllers/Aside/User/ProjectUserController.php
查看文件 @106e828
@@ -6,10 +6,10 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\UserLogic;
 use App\Http\Requests\Aside\User\UserRequest;
+use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use App\Models\User\User;
 use App\Models\User\User as UserModel;
-use Illuminate\Http\Request;
 /**
  * @remark :b端用户管理
@@ -19,7 +19,8 @@ use Illuminate\Http\Request;
  */
 class ProjectUserController extends BaseController
 {
-
+    //类型
+    const TYPE_ONE = 1;
     /**
      * @remark :用户列表
      * @name   :lists
@@ -33,7 +34,13 @@ class ProjectUserController extends BaseController
         $lists = $userModel->lists($this->map,$this->page,$this->row,$this->order,$filed);
         if(!empty($lists)){
             foreach ($lists['list'] as $k => $v){
-                $lists['list'][$k]['operator_name'] = (new User())->read(['id'=>$v['operator_id']],['name'])['name'];
+                if($v['type'] == $this::TYPE_ONE){
+                    $userModel = new UserModel();
+                    $lists['list'][$k]['operator_name'] = $userModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                }else{
+                    $managerModel = new Manage();
+                    $lists['list'][$k]['operator_name'] = $managerModel->read(['id'=>$v['operator_id']],['name'])['name'];
+                }
                 $lists['list'][$k]['project_name'] = (new Project())->read(['id'=>$v['project_id']],['title'])['title'];
             }
         }
--- a/app/Http/Controllers/Bside/User/ProjectRoleController.php
查看文件 @106e828
+++ b/app/Http/Controllers/Bside/User/ProjectRoleController.php
查看文件 @106e828
@@ -13,9 +13,11 @@ use Illuminate\Http\Request;
 class ProjectRoleController extends BaseController
 {
     /**
-     * @name :用户角色列表()
-     * @author :liyuhang
-     * @method
+     * @remark :获取角色列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 14:08
      */
     public function lists(){
         //TODO::根据当前登录用户返回
--- a/app/Http/Logic/Aside/Mail/MailLogic.php
查看文件 @106e828
+++ b/app/Http/Logic/Aside/Mail/MailLogic.php
查看文件 @106e828
@@ -5,6 +5,7 @@ namespace App\Http\Logic\Aside\Mail;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Mail\Mail as MailModel;
 use App\Models\Mail\MailUser;
+use App\Models\User\User;
 use Illuminate\Support\Facades\DB;
 use mysql_xdevapi\Exception;
@@ -35,10 +36,24 @@ class MailLogic extends BaseLogic
     }
     /**
-     * @name :获取详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :添加站内信时获取会员列表
+     * @name   :getUser
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:30
+     */
+    public function getUserList($map){
+        $userModel = new User();
+        $lists = $userModel->list($map,'created_at',['id','project_id','name','mobile','created_at']);
+        return $this->success($lists);
+    }
+
+    /**
+     * @remark :站内信详情
+     * @name   :mail_info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:29
      */
     public function mail_info(){
         $info = $this->model->read($this->param);
@@ -49,11 +64,13 @@ class MailLogic extends BaseLogic
         }
         return $this->success($info);
     }
+
     /**
-     * @name :添加会员
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :添加站内信
+     * @name   :mail_add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:28
      */
     public function mail_add(){
         //参数处理
@@ -66,10 +83,11 @@ class MailLogic extends BaseLogic
     }
     /**
-     * @name :编辑会员
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :编辑站内信
+     * @name   :mail_edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:27
      */
     public function mail_edit(){
         $this->param['user_list'] = $this->model->setUserList($this->param['user_list']);
@@ -81,10 +99,11 @@ class MailLogic extends BaseLogic
     }
     /**
-     * @name :删除会员
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :删除站内信
+     * @name   :mail_del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/8 9:27
      */
     public function mail_del(){
--- a/app/Http/Logic/Aside/User/ProjectRoleLogic.php
查看文件 @106e828
+++ b/app/Http/Logic/Aside/User/ProjectRoleLogic.php
查看文件 @106e828
@@ -4,6 +4,8 @@ namespace App\Http\Logic\Aside\User;
 use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Manage\Manage;
+use App\Models\Project\Project;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole;
 use App\Models\User\User as UserModel;
@@ -28,10 +30,10 @@ class ProjectRoleLogic extends BaseLogic
     public function role_get_menu(){
         $menuModel = new ProjectMenuModel();
         $this->param['status'] = $this::STATUS_ONE;
-        $lists = $menuModel->list($this->param,'id');
+        $lists = $menuModel->list($this->param,'created_at');
         $menu = array();
         if(!empty($lists)){
-            foreach ($lists as $k => $v){
+            foreach ($lists as $v){
                 $v = (array)$v;
                 if ($v['pid'] == 0) {
                     $v['sub'] = _get_child($v['id'], $lists);
@@ -55,6 +57,14 @@ class ProjectRoleLogic extends BaseLogic
             if($info === false){
                 $this->fail('当前数据不存在');
             }
+            if($info['type'] == 1){
+                $userModel = new UserModel();
+                $info['operator_name'] = $userModel->read(['id'=>$info['operator_id']],['name'])['name'];
+            }else{
+                $managerModel = new Manage();
+                $info['operator_name'] = $managerModel->read(['id'=>$info['operator_id']],['name'])['name'];
+            }
+            $info['project_name'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
             Common::set_user_cache($info,$this->model,$this->param['id'],'A');
         }
         return $this->success($info);
@@ -68,10 +78,17 @@ class ProjectRoleLogic extends BaseLogic
      */
     public function role_add(){
         //查询当前名称是否存在
-        $info = $this->model->read(['name'=>$this->param['name']]);
+        $info = $this->model->read([
+            'name'=>$this->param['name'],
+            'project_id'=>$this->param['project_id']]);
         if($info !== false){
-            $this->fail('当前菜单名称已存在');
+            $this->fail('当前角色名称已存在');
         }
+        //类型
+        $this->param['type'] = $this->model::TYPE_ONE;
+        //A端操作人
+        $this->param['create_id'] = $this->manager['id'];
+        $this->param['operator_id'] = $this->manager['id'];
         $rs = $this->model->add($this->param);
         if($rs === false){
             $this->fail('添加失败');
@@ -87,10 +104,14 @@ class ProjectRoleLogic extends BaseLogic
      */
     public function role_edit(){
         //查询当前名称是否存在
-        $info = $this->model->read(['name'=>$this->param['name'],'id'=>['!=',$this->param['id']]]);
+        $info = $this->model->read([
+                'name'=>$this->param['name'],
+                'id'=>['!=',$this->param['id']],
+                'project_id'=>$this->param['project_id']]);
         if($info !== false){
             $this->fail('当前菜单名称已存在');
         }
+        $this->param['operator_id'] = $this->manager['id'];
         $rs = $this->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('error');
--- a/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @106e828
+++ b/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @106e828
@@ -4,8 +4,10 @@ namespace App\Http\Logic\Aside\User;
 use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Manage\Manage;
 use App\Models\Project\Project;
 use App\Models\User\User;
+use App\Models\User\User as UserModel;
 class UserLogic extends BaseLogic
 {
@@ -30,7 +32,13 @@ class UserLogic extends BaseLogic
             if($info === false){
                 $this->fail('当前数据不存在');
             }
-            $info['operator_name'] = (new User())->read(['id'=>$info['operator_id']],['name'])['name'];
+            if($info['type'] == 1){
+                $userModel = new UserModel();
+                $info['operator_name'] = $userModel->read(['id'=>$info['operator_id']],['name'])['name'];
+            }else{
+                $managerModel = new Manage();
+                $info['operator_name'] = $managerModel->read(['id'=>$info['operator_id']],['name'])['name'];
+            }
             $info['project_name'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
             Common::set_user_cache($info,$this->model,$this->param['id'],'A');
         }
@@ -45,6 +53,11 @@ class UserLogic extends BaseLogic
     public function user_add(){
         $this->verifyMobile();//验证手机号
         $this->param['password'] = base64_encode(md5($this->param['password']));
+        //类型
+        $this->param['type'] = 1;
+        //A端操作人
+        $this->param['create_id'] = $this->manager['id'];
+        $this->param['operator_id'] = $this->manager['id'];
         $rs = $this->model->add($this->param);
         if($rs === false){
             $this->fail('添加失败');
@@ -67,6 +80,7 @@ class UserLogic extends BaseLogic
                 $this->param['password'] = base64_encode(md5($this->param['password']));
             }
         }
+        $this->param['operator_id'] = $this->manager['id'];
         $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->fail('编辑失败');
--- a/app/Http/Logic/Bside/User/RoleLogic.php
查看文件 @106e828
+++ b/app/Http/Logic/Bside/User/RoleLogic.php
查看文件 @106e828
@@ -103,6 +103,7 @@ class RoleLogic extends BaseLogic
         if($info !== false){
             $this->fail('当前添加的角色已存在');
         }
+        $this->param['operator_id'] = $this->user['id'];
         $this->edit($this->param,['id'=>$this->param['id']]);
         return $this->success();
     }
--- a/app/Http/Requests/Aside/User/ProjectRoleRequest.php
查看文件 @106e828
+++ b/app/Http/Requests/Aside/User/ProjectRoleRequest.php
查看文件 @106e828
@@ -19,7 +19,8 @@ class ProjectRoleRequest extends FormRequest
     public function rules()
     {
         return [
-            'name'=>'required|max:11||unique:gl_project_role',
+            'name'=>'required|max:11',
+            'project_id'=>'required',
             'role_menu'=>'required|string',
         ];
     }
@@ -29,6 +30,7 @@ class ProjectRoleRequest extends FormRequest
         return [
             'name.required'=>'名称必须填写',
             'name.max'   =>  '名称不大于11字符.',
+            'project_id.required'=>'所选项目不能为空',
             'role_menu.required'=>'角色列表必须填写',
         ];
     }
--- a/app/Models/User/ProjectRole.php
查看文件 @106e828
+++ b/app/Models/User/ProjectRole.php
查看文件 @106e828
@@ -10,4 +10,7 @@ class ProjectRole extends Base
     protected $table = 'gl_project_role';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+
+    //A端添加还是B端添加
+    const TYPE_ONE = 1;
 }
--- a/routes/aside.php
查看文件 @106e828
+++ b/routes/aside.php
查看文件 @106e828
@@ -65,6 +65,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('mail')->group(function () {
         Route::any('/', [Aside\Mail\MailController::class, 'lists'])->name('admin.mail_lists');
         Route::any('/info', [Aside\Mail\MailController::class, 'info'])->name('admin.mail_info');
+        Route::any('/getUser', [Aside\Mail\MailController::class, 'getUser'])->name('admin.mail_getUser');
         Route::any('/add', [Aside\Mail\MailController::class, 'add'])->name('admin.mail_add');
         Route::any('/edit', [Aside\Mail\MailController::class, 'edit'])->name('admin.mail_edit');
         Route::any('/del', [Aside\Mail\MailController::class, 'del'])->name('admin.mail_del');