From d7a9bfaf155af2f66a92641afeb9b7fa78d781d2 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 20 Mar 2025 12:45:00 +0800 Subject: [PATCH 1/2] 11 --- .../src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java index 1e400faa2..696dfc1d9 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java @@ -140,7 +140,7 @@ public class Drawing2D { public Drawing2D setDefaultStyle() { graphics.setColor(Color.BLACK); - graphics.setFont(new Font(fontFamily, Font.PLAIN, 22)); + graphics.setFont(new Font(fontFamily, Font.PLAIN, 24)); return this; } From 30f9167c45eddc763f2b48ba9637afa7f3c476cf Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 20 Mar 2025 16:12:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=AD=A3=E5=85=83=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/mapper/zy/ThirdZyIdDictMapper.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/mapper/zy/ThirdZyIdDictMapper.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/mapper/zy/ThirdZyIdDictMapper.java index 0de046018..c8ddb5ea3 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/mapper/zy/ThirdZyIdDictMapper.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/mapper/zy/ThirdZyIdDictMapper.java @@ -14,32 +14,36 @@ public interface ThirdZyIdDictMapper extends PjcloudBaseMapper getBySelfIds(ThirdZyBizEnumType type, List selfIds) { if (ObjectUtil.isEmpty(type)) return null; + if (ObjectUtil.isEmpty(selfIds)) return null; LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .in(ObjectUtil.isNotEmpty(selfIds), ThirdZyIdDictEntity::getSelfId, selfIds) + .in(ThirdZyIdDictEntity::getSelfId, selfIds) .eq(ThirdZyIdDictEntity::getBizType, type.getType()); return selectList(wrapper); } default ThirdZyIdDictEntity getBySelfId(ThirdZyBizEnumType type, String selfId) { if (ObjectUtil.isEmpty(type)) return null; + if (ObjectUtil.isEmpty(selfId)) return null; LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(selfId), ThirdZyIdDictEntity::getSelfId, selfId) + .eq(ThirdZyIdDictEntity::getSelfId, selfId) .eq(ThirdZyIdDictEntity::getBizType, type.getType()); return selectOne(wrapper); } default List getByZyIds(ThirdZyBizEnumType type, List zyIds) { if (ObjectUtil.isEmpty(type)) return null; + if (ObjectUtil.isEmpty(zyIds)) return null; LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .in(ObjectUtil.isNotEmpty(zyIds), ThirdZyIdDictEntity::getZyId, zyIds) + .in(ThirdZyIdDictEntity::getZyId, zyIds) .eq(ThirdZyIdDictEntity::getBizType, type.getType()); return selectList(wrapper); } default ThirdZyIdDictEntity getByZyIds(ThirdZyBizEnumType type, String zyId) { if (ObjectUtil.isEmpty(type)) return null; + if (ObjectUtil.isEmpty(zyId)) return null; LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(zyId), ThirdZyIdDictEntity::getZyId, zyId) + .eq(ThirdZyIdDictEntity::getZyId, zyId) .eq(ThirdZyIdDictEntity::getBizType, type.getType()); return selectOne(wrapper); }