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

xp.Huang
1 parent 2e6ddb3e
Showing 1 changed file with 5 additions and 2 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @04ea404
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkDeviceProfileController.java
View file @04ea404
@@ -65,14 +65,17 @@ public class TkDeviceProfileController extends BaseController {
       deviceProfileDTO.setTbProfileId(saveDeviceProfile.getId().toString());
       tkDeviceProfileService.insertOrUpdate(deviceProfileDTO);
     }catch (Exception e){
-      if (created) {
+      if (created && null !=saveDeviceProfile) {
         logEntityAction(emptyId(EntityType.DEVICE_PROFILE), saveDeviceProfile,
                 null, created ? ActionType.ADDED : ActionType.UPDATED, e);
         deviceProfileService.deleteDeviceProfile(getTenantId(), saveDeviceProfile.getId());
         tbClusterService.onDeviceProfileDelete(saveDeviceProfile, null);
         tbClusterService.broadcastEntityStateChangeEvent(saveDeviceProfile.getTenantId(), saveDeviceProfile.getId(), ComponentLifecycleEvent.DELETED);
-        throw handleException(e);
       }
+      if(e instanceof TkDataValidationException){
+        throw new TkDataValidationException(e.getMessage());
+      }
+      throw handleException(e);
     }