|
|
@@ -70,12 +70,12 @@ public class DeviceProductService extends SuperService {
|
|
|
return ResultContent.buildFail("数据不存在");
|
|
|
}
|
|
|
if (ObjectUtils.isNotEmpty(nameTemp) && !nameTemp.getId().equals(product.getId())) {
|
|
|
- return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, product.getName()));
|
|
|
+ return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, nameTemp.getName()));
|
|
|
}
|
|
|
initUpdateEntity(product);
|
|
|
} else {
|
|
|
if (ObjectUtils.isNotEmpty(nameTemp)) {
|
|
|
- return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, product.getName()));
|
|
|
+ return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, nameTemp.getName()));
|
|
|
}
|
|
|
product = new DeviceProduct();
|
|
|
initEntityNoCheckOid(product);
|