From 39abb48d6ff101c4071434e280d24761f3afbc1e Mon Sep 17 00:00:00 2001
From: xupei <1779019091@qq.com>
Date: Thu, 12 Oct 2023 10:11:27 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX=EF=BC=9Aoverall=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=20=E5=8D=B0=E8=8A=B1=E5=8F=82=E6=95=B0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=9C=89null=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/impl/DesignServiceImpl.java   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index 635ca07e..e3364612 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -1048,15 +1048,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         if (designItemDetailPrints.size() == 1){
             DesignItemDetailPrint detailPrint = designItemDetailPrints.get(0);
             DesignSinglePrint designSinglePrint = new DesignSinglePrint();
-            // overall 模式下只需要返回印花url和scale
-            if (detailPrint.getSingleOrOverall().equals("overall")){
-                designSinglePrintDTO.setIfSingle(Boolean.FALSE);
-            }else {
-                designSinglePrintDTO.setIfSingle(Boolean.TRUE);
-                designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
-                designSinglePrint.setAngle(detailPrint.getAngle());
-                designSinglePrint.setPriority(detailPrint.getPriority());
-            }
+            designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
+            designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
+            designSinglePrint.setAngle(detailPrint.getAngle());
+            designSinglePrint.setPriority(detailPrint.getPriority());
             designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(),24 * 60));
             designSinglePrint.setMinIOPath(detailPrint.getPath());
             designSinglePrint.setScale(detailPrint.getScale());