From b957c2c23920a3ee3b8295639d91dd820de6c3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 12 Dec 2022 00:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E9=87=8D=E5=90=8D=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/SupplierController.java    | 2 +-
 .../src/main/java/com/jsh/erp/service/CommonQueryManager.java   | 2 +-
 .../main/java/com/jsh/erp/service/supplier/SupplierService.java | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java
index 7238afee..05d8d107 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java
@@ -58,7 +58,7 @@ public class SupplierController {
     @GetMapping(value = "/checkIsNameAndTypeExist")
     @ApiOperation(value = "检查名称和类型是否存在")
     public String checkIsNameAndTypeExist(@RequestParam Long id,
-                                          @RequestParam(value ="name") String name,
+                                          @RequestParam(value ="name", required = false) String name,
                                           @RequestParam(value ="type") String type,
                                           HttpServletRequest request)throws Exception {
         Map<String, Object> objectMap = new HashMap<>();
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java
index cc560c9b..b78590c4 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java
@@ -128,7 +128,7 @@ public class CommonQueryManager {
      * @return
      */
     public int checkIsNameExist(String apiName, Long id, String name) throws Exception{
-        if (StringUtil.isNotEmpty(apiName)) {
+        if (StringUtil.isNotEmpty(apiName) && name!=null) {
             return container.getCommonQuery(apiName).checkIsNameExist(id, name);
         }
         return 0;
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
index 165198c9..c914cc5c 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java
@@ -272,6 +272,7 @@ public class SupplierService {
     }
 
     public int checkIsNameAndTypeExist(Long id, String name, String type)throws Exception {
+        name = name == null? "": name;
         SupplierExample example = new SupplierExample();
         example.createCriteria().andIdNotEqualTo(id).andSupplierEqualTo(name).andTypeEqualTo(type)
                 .andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED);