From 8e0edab0f8e597ed8dc830398a917fe9a6fc6e9f Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Fri, 27 May 2022 18:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/basemodelconfig/BaseModelConfigQuery.java     | 2 ++
 .../biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java   | 2 ++
 .../base/biz/basemanufacturer/BaseManufacturerService.java | 6 ------
 .../base/biz/basemodelconfig/BaseModelConfigService.java   | 7 +++++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
index 6e1c6dc25a..7dbfb7e32e 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
@@ -67,4 +67,6 @@ public class BaseModelConfigQuery implements Query {
     private String multimediaKey;
     @ApiModelProperty("简述配置名称")
     private String configName;
+    @ApiModelProperty("简述配置sid")
+    private String configSid;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java
index 25b36ef0f3..1dac6b6d8f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java
@@ -116,6 +116,8 @@ public class BaseAffiliatCompanyRest implements BaseAffiliatCompanyFeign {
             if (i == 0) {
                 return rb.fail().setMsg("附件保存失败");
             }
+        }else {
+            baseAffiliatCompanyAppendixService.deleteCompanySid(sid);
         }
         int i = baseAffiliatCompanyService.updateBySid(dto.toMap(), sid);
         if (i == 0) {
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
index 5c766daaa2..2ab8f139dc 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
@@ -354,12 +354,6 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         if (baseManufacturer == null) {
             return rb.setMsg("该厂商不存在");
         }
-        String name = baseManufacturerDto.getManufacturerName();
-        //查询厂商名称是否存在
-        int count = selectCountByNameAndSid(name, sid);
-        if (count > 0) {
-            return rb.setMsg("该厂商名称已存在");
-        }
         int i = updateBySid(dto.toMap(), sid);
         if (i == 0) {
             return ResultBean.fireFail().setMsg("供应厂商信息修改失败");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
index 129c27bac7..7bb54383f9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
@@ -134,6 +134,13 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             if (StringUtils.isNotBlank(pagerQuery.getConfigName())) {//简述配置名称
                 qw.like("bmc.configName", pagerQuery.getConfigName());
             }
+            String configSid = pagerQuery.getConfigSid();
+            if (StringUtils.isNotBlank(configSid)){
+                String[] configSids = configSid.split(",");
+                for (String sid : configSids) {
+                    qw.ne("bmc.sid",sid);
+                }
+            }
         }
         return qw;
     }