From b8b709b0195aaca16152152447313d4fa56b473a Mon Sep 17 00:00:00 2001 From: zhangxuanming <2260476558@qq.com> Date: Mon, 23 Dec 2024 17:58:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AE=A2=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E2=80=9C=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=E5=B7=B2=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E2=80=9D=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/mes/md/controller/MdClientController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdClientController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdClientController.java index 88093ad..11b754d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdClientController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdClientController.java @@ -3,6 +3,7 @@ package com.ktg.mes.md.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.util.ObjectUtil; import com.ktg.common.constant.UserConstants; import com.ktg.mes.md.domain.MdVendor; import com.ktg.mes.wm.utils.WmBarCodeUtil; @@ -124,9 +125,10 @@ public class MdClientController extends BaseController if(UserConstants.NOT_UNIQUE.equals(mdClientService.checkClientNameUnique(mdClient))){ return AjaxResult.error("客户名称已存在！"); } - - if(UserConstants.NOT_UNIQUE.equals(mdClientService.checkClientNickUnique(mdClient))){ - return AjaxResult.error("客户简称已存在！"); + if (ObjectUtil.isNotEmpty(mdClient.getClientNick())) { + if(UserConstants.NOT_UNIQUE.equals(mdClientService.checkClientNickUnique(mdClient))){ + return AjaxResult.error("客户简称已存在！"); + } } mdClientService.insertMdClient(mdClient); @@ -151,9 +153,12 @@ public class MdClientController extends BaseController return AjaxResult.error("客户名称已存在！"); } - if(UserConstants.NOT_UNIQUE.equals(mdClientService.checkClientNickUnique(mdClient))){ - return AjaxResult.error("客户简称已存在！"); + if (ObjectUtil.isNotEmpty(mdClient.getClientNick())) { + if(UserConstants.NOT_UNIQUE.equals(mdClientService.checkClientNickUnique(mdClient))){ + return AjaxResult.error("客户简称已存在！"); + } } + return toAjax(mdClientService.updateMdClient(mdClient)); }