fix: [DEFECT-1550] 新增、编辑存在的设备名称时，没有把异常正确返回给前端

@@ -126,7 +126,7 @@ public class TkDeviceController extends BaseController {
       newDeviceDTO =
           tkdeviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
     } catch (Exception e) {
-      if (created) {
+      if (created && null !=savedDevice) {
         logEntityAction(
                 getCurrentUser(),
                 savedDevice.getId(),
@@ -135,8 +135,11 @@ public class TkDeviceController extends BaseController {
                 created ? ActionType.ADDED : ActionType.UPDATED,
                 e);
         deleteTbDevice(selfTbIdStr);
-        throw handleException(e);
       }
+      if(e instanceof TkDataValidationException){
+        throw new TkDataValidationException(e.getMessage());
+      }
+      throw handleException(e);
     }
     return ResponseEntity.ok(newDeviceDTO);
   }