From 5101dd4e9c319cc10aad425ea0f089536ab3f6d1 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 3 Jul 2024 17:54:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(UserShipLogic):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=88=B9=E5=8F=AA=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user_ship/UserShipLogic.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/user_ship/UserShipLogic.php b/app/admin/logic/user_ship/UserShipLogic.php
index 9d6880ae0..ede9266eb 100644
--- a/app/admin/logic/user_ship/UserShipLogic.php
+++ b/app/admin/logic/user_ship/UserShipLogic.php
@@ -105,22 +105,33 @@ class UserShipLogic extends BaseLogic
     public static function user_ship($params){
         $user_ship=$params['user_ship']??0;
         if($user_ship==2){
+            if(!isset($params['village'])){
+                self::setError('请设置村参数');
+                return false;
+            }
             $arr=User::where('user_ship',$user_ship)->column('id');
             if($arr){
                 $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->find();
                 if($find){
                     self::setError('该区域又有村长请重新选择');
+                    return false;
                 }
             }
         }elseif($user_ship==3){
+            if(!isset($params['brigade'])){
+                self::setError('请设置队参数');
+                return false;
+            }
             $arr=User::where('user_ship',$user_ship)->column('id');
             if($arr){
-                $find=UserAddress::where('uid','in',$arr)->where('brigade',$params['brigade'])->find();
+                $find=UserAddress::where('uid','in',$arr)->where('village',$params['village'])->where('brigade',$params['brigade'])->find();
                 if($find){
-                    self::setError('该区域已有对长请重新选择');
+                    self::setError('该区域已有队长请重新选择');
+                    return false;
                 }
             }
         }
+        return true;
     }
 
 }
\ No newline at end of file