From ba850eb92aacd74d36add2de7f7ec0a15f3aa216 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 25 Aug 2022 16:27:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E8=B0=83=E6=95=B4=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/admin/controller/basic/BasicThirdSysController.java | 2 +-
 .../api/admin/controller/inout/WareHouseController.java     | 2 +-
 .../api/admin/entity/basic/BasicUnitMaintainEntity.java     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
index 8b5d31ce..6460dec2 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
@@ -133,7 +133,7 @@ public class BasicThirdSysController {
             }
 
 
-            if (temp.getMainSys() && !temp.getEnabled()) {
+            if (basicThirdSysEntity.getMainSys() && !basicThirdSysEntity.getEnabled()) {
                 return ResultVOUtils.error(500, "主系统必须启用");
             }
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 44a8e90e..1c81e354 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -325,7 +325,7 @@ public class WareHouseController {
             return ResultVOUtils.error(500, "无效条码！批次号超出最大范围");
         }
 
-        if (StrUtil.isEmpty(warehouseEntity.getSerialNo()) && StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
+        if (StrUtil.isBlank(warehouseEntity.getSerialNo()) && StrUtil.isBlank(warehouseEntity.getBatchNo())) {
             return ResultVOUtils.error(500, "批次号不能为空！");
         }
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java
index fb8e283d..b3224456 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java
@@ -2,7 +2,7 @@ package com.glxp.api.admin.entity.basic;
 
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 @Data
@@ -11,14 +11,14 @@ public class BasicUnitMaintainEntity {
     private Integer id;
     private String erpId;
 
-    @NotEmpty(message = "往来单位名称不能为空！")
+    @NotBlank(message = "往来单位名称不能为空！")
     private String name;
     private String spell;
     private String addr;
     private String status;
     private String type;
 
-    @NotEmpty(message = "社会信用号不能为空！")
+    @NotBlank(message = "社会信用号不能为空！")
     private String creditNo;
     private String contact;
     private String mobile;