From 49d7ce5a988596d7540083be0e1948bcb66af544 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:12:03 +0800
Subject: [PATCH] chore:补充提交

---
 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 c92f3cf..d230674 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
@@ -50,10 +50,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