Showing
1 changed file
with
7 additions
and
1 deletions
@@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity; | @@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity; | ||
7 | import org.springframework.security.access.prepost.PreAuthorize; | 7 | import org.springframework.security.access.prepost.PreAuthorize; |
8 | import org.springframework.web.bind.annotation.*; | 8 | import org.springframework.web.bind.annotation.*; |
9 | import org.thingsboard.server.common.data.exception.ThingsboardException; | 9 | import org.thingsboard.server.common.data.exception.ThingsboardException; |
10 | +import org.thingsboard.server.common.data.id.EntityId; | ||
10 | import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO; | 11 | import org.thingsboard.server.common.data.yunteng.dto.SysAppDesignDTO; |
11 | import org.thingsboard.server.controller.BaseController; | 12 | import org.thingsboard.server.controller.BaseController; |
12 | import org.thingsboard.server.dao.yunteng.service.SysAppDesignService; | 13 | import org.thingsboard.server.dao.yunteng.service.SysAppDesignService; |
@@ -27,7 +28,12 @@ public class YtAppDesignController extends BaseController { | @@ -27,7 +28,12 @@ public class YtAppDesignController extends BaseController { | ||
27 | @GetMapping("get") | 28 | @GetMapping("get") |
28 | @ApiOperation("查询详情") | 29 | @ApiOperation("查询详情") |
29 | public ResponseEntity<SysAppDesignDTO> get() throws ThingsboardException { | 30 | public ResponseEntity<SysAppDesignDTO> get() throws ThingsboardException { |
30 | - return ResponseEntity.ok(sysAppDesignService.get(getCurrentUser().getCurrentTenantId())); | 31 | + String tenantId = EntityId.NULL_UUID.toString(); |
32 | + try { | ||
33 | + tenantId = getCurrentUser().getCurrentTenantId(); | ||
34 | + } catch (ThingsboardException e) { | ||
35 | + } | ||
36 | + return ResponseEntity.ok(sysAppDesignService.get(tenantId)); | ||
31 | } | 37 | } |
32 | 38 | ||
33 | @PutMapping("update") | 39 | @PutMapping("update") |