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 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