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

@@ -80,9 +80,10 @@ class MailController extends BaseController
      */
      */
     public function del(MailLogic $mailLogic){
     public function del(MailLogic $mailLogic){
         $this->request->validate([
         $this->request->validate([
-            'id'=>'required'
+            'id'=>['required','array'],
         ],[
         ],[
-            'id.required' => 'ID不能为空'
+            'id.required' => 'ID不能为空',
+            'id.array' => 'ID为数组',
         ]);
         ]);
         $mailLogic->mail_del();
         $mailLogic->mail_del();
         $this->response('success');
         $this->response('success');

@@ -21,6 +21,9 @@ class ProjectDeptController extends BaseController
      * @time   :2023/6/17 16:13
      * @time   :2023/6/17 16:13
      */
      */
     public function lists(DeptLogic $deptLogic){
     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);
         $lists = $deptLogic->DeptLists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }

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

@@ -4,6 +4,9 @@ namespace App\Http\Logic\Aside\Mail;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Mail\Mail as MailModel;
 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
 class MailLogic extends BaseLogic
 {
 {
@@ -84,10 +87,16 @@ class MailLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function mail_del(){
     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();
         return $this->success();
     }
     }

@@ -25,14 +25,12 @@ class WebSettingCountryLogic extends BaseLogic
      */
      */
     public function country_list(){
     public function country_list(){
         $lists = $this->model->list($this->param,'id',['id','name','country_img']);
         $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);
         return $this->success($lists);
     }
     }
 
 
-    public function edit_country(){
-
-        return $this->success();
-    }
 }
 }