From ec0ecbdacd9d1d649ce2da1117ae25a564da1292 Mon Sep 17 00:00:00 2001 From: ziin Date: Thu, 4 Dec 2025 18:43:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(character):=20=E4=BF=AE=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BA=BA=E8=AE=BE=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 KeyboardUserCharacterVO 新增 characterId 字段， 并把 ServiceImpl 中两处 getId() 比对改为 getCharacterId()， 确保用户是否已添加的判断逻辑正确。 --- .../model/vo/character/KeyboardCharacterRespVO.java | 1 - .../model/vo/character/KeyboardUserCharacterVO.java | 2 ++ .../keyborad/service/impl/KeyboardCharacterServiceImpl.java | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java index 7cb8acf..6b782bf 100644 --- a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java +++ b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardCharacterRespVO.java @@ -23,7 +23,6 @@ public class KeyboardCharacterRespVO { @Schema(description="标题") private String characterName; - @Schema(description="背景描述") private String characterBackground; diff --git a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java index 5b0af17..d896a09 100644 --- a/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java +++ b/src/main/java/com/yolo/keyborad/model/vo/character/KeyboardUserCharacterVO.java @@ -29,5 +29,7 @@ public class KeyboardUserCharacterVO { @Schema(description = "emoji") private String emoji; + @Schema(description = "角色 Id") + private Long characterId; } \ No newline at end of file diff --git a/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java index e15a41c..6036909 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java @@ -52,10 +52,12 @@ public class KeyboardCharacterServiceImpl extends ServiceImpl userCharacterVOList = keyboardUserCharacterMapper.selectByUserId(userId); + List keyboardCharacterRespVOS = BeanUtil.copyToList(keyboardCharacters, KeyboardCharacterRespVO.class); + keyboardCharacterRespVOS.forEach(character -> { character.setAdded(userCharacterVOList.stream().anyMatch(userCharacter -> - userCharacter.getId().equals(character.getId()))); + userCharacter.getCharacterId().equals(character.getId()))); }); return keyboardCharacterRespVOS; @@ -75,7 +77,7 @@ public class KeyboardCharacterServiceImpl extends ServiceImpl keyboardCharacterRespVOS = BeanUtil.copyToList(keyboardCharacters, KeyboardCharacterRespVO.class); keyboardCharacterRespVOS.forEach(character -> { character.setAdded(userCharacterVOList.stream().anyMatch(userCharacter -> - userCharacter.getId().equals(character.getId()))); + userCharacter.getCharacterId().equals(character.getId()))); }); return keyboardCharacterRespVOS; }