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