diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
index b5569e8..4ab4b2a 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java
@@ -218,7 +218,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
}
int result = mapper.isBdDeviceDetailExist(vo);
if (result > 0) {
- return AjaxResult.error("检测不能重复");
+ return AjaxResult.error("检测名称不能重复");
}
if (StringUtils.isEmpty(vo.getId())) {
String id = IdUtils.getuid();
diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
index 43ea6ba..826ed18 100644
--- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
+++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml
@@ -169,11 +169,7 @@
- UPDATE tb_device_value
-
- unit = #{unit},
-
- WHERE attribute_id = #{id}
+ UPDATE tb_device_value SET unit = #{unit} WHERE attribute_id = #{id}
@@ -274,6 +270,7 @@
)
+ ORDER BY tbd.create_time DESC