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)); }