From 504f036599494f12f4ade039640ae2e54d7b11e2 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 15 Jul 2024 16:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=8F=8A=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LabelFieldContentServiceImpl.java                 | 2 +-
 .../labelfieldinfo/impl/LabelFieldInfoServiceImpl.java     | 2 +-
 .../mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml  | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
index dee3c483..e5c89fa6 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java
@@ -294,8 +294,8 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService {
                 if (StringUtils.isBlank(portraitSnVO.getPortraitSn())) {
                     portraitSnVO.setPortraitSn(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS")));
                     portraitSnVO.getGroupingValues().forEach(item -> item.setPortraitSn(portraitSnVO.getPortraitSn()));
-                    groupingValues.addAll(portraitSnVO.getGroupingValues());
                 }
+                groupingValues.addAll(portraitSnVO.getGroupingValues());
                 TimeUnit.MILLISECONDS.sleep(10);
             }
         } catch (InterruptedException e) {
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
index af02220b..83718c42 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
@@ -75,7 +75,7 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
             return new ArrayList<>();
         }
         int i = 1;
-        //查询细分
+        //根据细分id查询细分标签
         List<LabelFieldVO> labelFieldList = labelFieldInfoMapper.selectLabelFieldList(taskPartitionDictId, fieldType);
         List<Long> taskPartitionDictIds = labelFieldList.stream().filter(Objects::nonNull).map(LabelFieldVO::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         if (taskPartitionDictIds.size() == 0) {
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
index 354cbdd4..6a0a38fe 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
@@ -71,10 +71,13 @@
         LEFT JOIN task_type_dict ttd ON ttd.id = tpd.task_type_id
         <where>
             <if test="fieldType != null  and fieldType != ''">
-                lfi.field_type = #{fieldType}
+                and lfi.field_type = #{fieldType}
             </if>
             <if test="taskPartitionDictId != null">
-                tpd.id = #{taskPartitionDictId}
+                and tpd.id = #{taskPartitionDictId}
+            </if>
+            <if test="taskPartitionDictId != null">
+                or  tpd.apply_range = 'PUBLIC'
             </if>
         </where>
         group by task_partition_dict_id