Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -13,9 +13,11 @@ use App\Models\Mail\Mail as MailModel;
  */
 class MailController extends BaseController
 {
-    public function lists(){
-        $mailModel = new MailModel();
-        $lists = $mailModel->lists($this->map,$this->page,$this->row,$this->order);
+    public function lists(MailLogic $mailLogic){
+        if(isset($this->map['title']) && !empty($this->map['title'])){
+            $this->map['title'] = ['like','%'.$this->map['title'].'%'];
+        }
+        $lists = $mailLogic->mail_lists($this->map,$this->page,$this->row,$this->order);
         $this->response('列表',Code::SUCCESS,$lists);
     }
 
@@ -78,9 +80,10 @@ class MailController extends BaseController
      */
     public function del(MailLogic $mailLogic){
         $this->request->validate([
-            'id'=>'required'
+            'id'=>['required','array'],
         ],[
-            'id.required' => 'ID不能为空'
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
         ]);
         $mailLogic->mail_del();
         $this->response('success');

@@ -21,6 +21,9 @@ class ProjectDeptController extends BaseController
      * @time   :2023/6/17 16:13
      */
     public function lists(DeptLogic $deptLogic){
+        if(isset($this->map['title']) && !empty($this->map['title'])){
+            $this->map['title'] = ['like','%'.$this->map['title'].'%'];
+        }
         $lists = $deptLogic->DeptLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
     }

@@ -18,11 +18,13 @@ use Illuminate\Http\Request;
  */
 class ProjectMenuController extends BaseController
 {
+
     /**
-     * @name :用户菜单列表
-     * @return json
-     * @author :liyuhang
-     * @method
+     * @remark :用户菜单列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:24
      */
     public function lists(){
         $menuModel = new ProjectMenuModel();
@@ -31,10 +33,24 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :详情
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @remark :添加菜单时获取菜单列表
+     * @name   :list
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:24
+     */
+    public function list(ProjectMenuLogic $projectMenuLogic){
+        $lists = $projectMenuLogic->MenuList();
+        $this->response('success',Code::SUCCESS,$lists);
+    }
+
+    /**
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :详情
+     * @name   :info
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:23
      */
     public function info(ProjectMenuLogic $projectMenuLogic){
         $this->request->validate([
@@ -47,10 +63,13 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :添加菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleRequest $request
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :添加菜单
+     * @name   :add
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:23
      */
     public function add(ProjectRoleRequest $request,ProjectMenuLogic $projectMenuLogic){
         $request->validated();
@@ -59,10 +78,13 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :编辑菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectRoleRequest $request
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :编辑菜单
+     * @name   :edit
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:22
      */
     public function edit(ProjectRoleRequest $request,ProjectMenuLogic $projectMenuLogic){
         $request->validate([
@@ -75,10 +97,12 @@ class ProjectMenuController extends BaseController
     }
 
     /**
-     * @name :删除菜单
-     * @return void
-     * @author :liyuhang
-     * @method
+     * @param ProjectMenuLogic $projectMenuLogic
+     * @remark :删除菜单
+     * @name   :del
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:22
      */
     public function del(ProjectMenuLogic $projectMenuLogic){
         $this->request->validate([

@@ -164,9 +164,6 @@ class BaseController extends Controller
                             $data['images_link'][$k1] = url('/b/image/' . $v1);
                         }
                         break;
-                    case 'country_img'://国家图标
-                        $data['image_link'] = url('upload/country/' . $v);
-                        break;
                     case 'file':
                         $data['file_link'] = url('/b/file_hash/' . $v);
                         break;

@@ -4,6 +4,9 @@ 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 Illuminate\Support\Facades\DB;
+use mysql_xdevapi\Exception;
 
 class MailLogic extends BaseLogic
 {
@@ -15,6 +18,23 @@ class MailLogic extends BaseLogic
     }
 
     /**
+     * @remark :列表
+     * @name   :mail_lists
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 16:38
+     */
+    public function mail_lists($map,$page,$row,$order = 'created_at',$filed = ['*']){
+        $lists = $this->model->lists($map,$page,$row,$order,$filed);
+        if(!empty($lists)){
+            foreach ($lists['list'] as $k => $v){
+                $lists['list'][$k]['user_list_name'] = $this->model->getUserListName($v['user_list']);
+            }
+        }
+        return $this->success($lists);
+    }
+
+    /**
      * @name :获取详情
      * @return void
      * @author :liyuhang
@@ -22,7 +42,9 @@ class MailLogic extends BaseLogic
      */
     public function mail_info(){
         $info = $this->model->read($this->param);
-        if($info === false){
+        //参数处理
+        $info['user_list_name'] = $this->model->getUserListName($info['user_list']);
+        if($info === false) {
             $this->fail('当前数据不存在');
         }
         return $this->success($info);
@@ -34,6 +56,8 @@ class MailLogic extends BaseLogic
      * @method
      */
     public function mail_add(){
+        //参数处理
+        $this->param['user_list'] = $this->model->setUserList($this->param['user_list']);
         $rs = $this->model->add($this->param);
         if($rs === false){
             $this->fail('添加失败');
@@ -48,6 +72,7 @@ class MailLogic extends BaseLogic
      * @method
      */
     public function mail_edit(){
+        $this->param['user_list'] = $this->model->setUserList($this->param['user_list']);
         $rs = $this->model->edit($this->param);
         if($rs === false){
             $this->fail('编辑失败');
@@ -62,11 +87,19 @@ class MailLogic extends BaseLogic
      * @method
      */
     public function mail_del(){
-        $this->param['id'] = ['in',$this->param['id']];
-        $rs = $this->model->del($this->param);
-        if($rs === false){
-            $this->fail('删除失败');
+
+        DB::beginTransaction();
+        try {
+            $this->model->del(['id'=>['in',$this->param['id']]]);
+            $mailUserModel = new MailUser();
+            $mailUserModel->del(['mail_id'=>['in',$this->param['id']]]);
+            DB::commit();
+        }catch (Exception $e){
+            DB::rollBack();
+            $this->fail('error');
         }
         return $this->success();
     }
+
+
 }

@@ -83,4 +83,16 @@ class ProjectMenuLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :添加时获取菜单列表
+     * @name   :MenuList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 17:26
+     */
+    public function MenuList(){
+        $list = $this->model->list(['status'=>$this->model::ZERO,'is_role'=>$this->model::ZERO]);
+        return $this->success($list);
+    }
 }

@@ -25,14 +25,12 @@ class WebSettingCountryLogic extends BaseLogic
      */
     public function country_list(){
         $lists = $this->model->list($this->param,'id',['id','name','country_img']);
-        if (empty($lists)){
-            $this->fail('当前数据不存在');
+        if (!empty($lists)){
+            foreach ($lists as $k => $v){
+                $lists[$k]['image_link'] = url('upload/country/' . $v['country_img']);
+            }
         }
         return $this->success($lists);
     }
 
-    public function edit_country(){
-
-        return $this->success();
-    }
 }

@@ -94,6 +94,7 @@ class Base extends Model
         $lists = $lists->toArray();
         return $lists;
     }
+
     /**
      * @name :获取单条数据详情
      * @param array

@@ -3,6 +3,7 @@
 namespace App\Models\Mail;
 
 use App\Models\Base;
+use App\Models\User\User;
 
 class Mail extends Base
 {
@@ -11,4 +12,40 @@ class Mail extends Base
     public $timestamps = true;
     //连接数据库
 //    protected $connection = 'custom_mysql';
+
+
+    /**
+     * @param $value
+     * @remark :获取器userList参数处理
+     * @name   :getUserListAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 15:58
+     */
+    public function getUserListName($values)
+    {
+        $str = '';
+        if(!empty($values)){
+            $arr = explode(',',$values);
+            $userModel = new User();
+            $list = $userModel->list(['id'=>['in',$arr]]);
+            foreach ($list as $v){
+                $str .= $v['name'].',';
+            }
+        }
+        return trim($str,',');
+    }
+
+    /**
+     * @param $value
+     * @remark :userList参数处理
+     * @name   :getUserListAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/21 15:58
+     */
+    public function setUserList($values)
+    {
+        return ','.trim($values,',').',';
+    }
 }

@@ -10,4 +10,6 @@ class ProjectMenu extends Base
     protected $table = 'gl_project_menu';
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
+
+    const ZERO = 0;
 }