From 8b19772f103986f222b44b302c3b02da3dc19cf4 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 11:07:50 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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..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
@@ -5,7 +5,6 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -14,7 +13,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import java.util.Map;
import com.moral.api.entity.Device;
import com.moral.api.entity.Organization;
@@ -22,7 +20,7 @@
import com.moral.api.service.OrganizationService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
-import com.sun.org.apache.regexp.internal.RE;
+
@Slf4j
@Api(tags = {"���������������������"})
@@ -50,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