Browse Source

问题修改

master
God 3 years ago
parent
commit
8e0edab0f8
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigQuery.java
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaffiliatcompany/BaseAffiliatCompanyRest.java
  3. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  4. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

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

2
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) {

6
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("供应厂商信息修改失败");

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

Loading…
Cancel
Save