From a860a554680453f533328858a525e663a22e86ed Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 10:20:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030
---
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
index 2032109..d22bb76 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
@@ -48,10 +48,7 @@
@ApiOperation(value = "���������������������")
public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "������ID") Integer organizationId){
List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
- if (ObjectUtils.isEmpty(organizationDevice)){
- return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
- }
- return ResultMessage.ok(organizationDevice);
+ return ResultMessage.ok(ObjectUtils.isEmpty(organizationDevice)?null:organizationDevice);
}
@GetMapping("fuzzySearch")
--
Gitblit v1.8.0