From 766351e0f6eb6dcd36e3057d533b16d848d3fd18 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Thu, 15 Jun 2023 10:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E7=82=B9=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/merchant/MerchantCashPlaceController.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
index 5e50b36..1006a76 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java
@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author DJH
@@ -35,7 +36,9 @@ public class MerchantCashPlaceController {
     @PostMapping
     public Result<Object> add(@RequestBody MerchantCashPlace merchantCashPlace) {
         //判定字符位数
-        size(merchantCashPlace.getAddress());
+        if (Objects.equals(merchantCashPlace.getAddress(), null) || Objects.equals(merchantCashPlace.getName(), null)){
+            throw new MsgException("地址或收银点名称不能为空");
+        }
         size(merchantCashPlace.getName());
         cashPlaceService.saveOrUpdate(merchantCashPlace);
         return ResultGenerator.genSuccessResult("保存成功", merchantCashPlace);
@@ -106,9 +109,6 @@ public class MerchantCashPlaceController {
         return ResultGenerator.genSuccessResult(pageData);
     }
     private void size(String character){
-        if (character.isEmpty()){
-            throw new MsgException("地址或收银点名称不能为空");
-        }
         if (character.length() >= 50){
             throw new MsgException("输入内容过长");
         }