Merge branch 'master' into 后端权限控制

@@ -103,21 +103,21 @@ public class YtDataComponentController extends BaseController {
       throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
     deleteDTO.setTenantId(tenantId);
+
+    DataBoardDTO dataBoardDTO = ytDataBoardService.findDataBoardInfoById(dataBoardId, tenantId);
+    if (null == dataBoardDTO) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
     int deleteNum = ytDataComponentService.deleteDataComponent(deleteDTO);
 
     int zero = FastIotConstants.MagicNumber.ZERO;
     boolean result = deleteNum > zero;
     if (result) {
-      DataBoardDTO dataBoardDTO = ytDataBoardService.findDataBoardInfoById(dataBoardId, tenantId);
-      if (null != dataBoardDTO) {
-        int count =
-            dataBoardDTO.getComponentNum() != null
-                ? dataBoardDTO.getComponentNum() - deleteNum < zero
-                    ? zero
-                    : dataBoardDTO.getComponentNum() - deleteNum
-                : zero;
-        ytDataBoardService.updateDataBoardComponentNum(dataBoardId, tenantId, count);
-      }
+      int count =
+          dataBoardDTO.getComponentNum() != null
+              ? Math.max(dataBoardDTO.getComponentNum() - deleteNum, zero)
+              : zero;
+      ytDataBoardService.updateDataBoardComponentNum(dataBoardId, tenantId, count);
     }
     return ResponseResult.success(result);
   }