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;