From 71fcab373acc042008c1edb690d9f7bd09c261d7 Mon Sep 17 00:00:00 2001
From: kira <yinruoxi666@126.com>
Date: Fri, 2 Feb 2024 11:48:14 +0800
Subject: [PATCH] =?UTF-8?q?yinruoxi=20sonar=EF=BC=9A=20=20=20=20=201.Call?=
 =?UTF-8?q?=20"Optional#isPresent()"=20or=20"!Optional#isEmpty()"=20before?=
 =?UTF-8?q?=20accessing=20the=20value.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../digitalmans/service/impl/DmDigitalmanServiceImpl.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmDigitalmanServiceImpl.java b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmDigitalmanServiceImpl.java
index e7f5b69d..24029028 100644
--- a/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmDigitalmanServiceImpl.java
+++ b/xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/service/impl/DmDigitalmanServiceImpl.java
@@ -265,9 +265,9 @@ public class DmDigitalmanServiceImpl extends BaseServiceImpl<DmDigitalmanQuery,
             R<List<DmSuitVo>> suitVos = remoteWardrobeService.suitList(1L, TenantConstants.Source.SLAVE.getCode(), "inner");
             if (suitVos.isOk()) {
                 List<DmSuitVo> suitVoList = suitVos.getData();
-                if (suitVoList != null && suitVoList.size() > 0) {
+                if (suitVoList != null && !suitVoList.isEmpty()) {
                     // 获取suitVoList中id与dto.getCurrentSuit相同的对象
-                    DmSuitVo suitVo = suitVoList.stream().filter(item->item.getId().equals(dto.getSuitId())).findFirst().get();
+                    DmSuitVo suitVo = suitVoList.stream().filter(item->item.getId().equals(dto.getSuitId())).findFirst().orElseGet(DmSuitVo::new);
                     dto.setSuit(suitVo);
                 }
             }
@@ -277,10 +277,9 @@ public class DmDigitalmanServiceImpl extends BaseServiceImpl<DmDigitalmanQuery,
 
     @Override
     public DmDigitalmanExtPo selectExt(String devId) {
-        DmDigitalmanExtPo po = dmDigitalmanExtMapper.selectOne(
+        return dmDigitalmanExtMapper.selectOne(
                 Wrappers.<DmDigitalmanExtPo>query().lambda()
                         .eq(DmDigitalmanExtPo::getDeviceId, devId).last(SqlConstants.LIMIT_ONE));
-        return po;
     }
 
     @Override