From 8294ff5cd2b90715a0841bddf76f44ec309881a0 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 13 Aug 2026 18:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=BB=84=E7=BB=87=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BB=8Edict=5Fdata=E5=88=9B=E5=BB=BA=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/lable/LabelServiceImpl.java       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
index 569e0b82a..660f0a6ac 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java
@@ -2,6 +2,7 @@ package com.cf.imes.module.system.service.lable;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.enums.DeletedCodeEnum;
 import com.cf.imes.framework.common.enums.UserSettingTypeEnum;
 import com.cf.imes.framework.common.exception.ServiceException;
@@ -13,6 +14,7 @@ import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO;
 import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO;
 import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO;
 import com.cf.imes.module.system.controller.admin.label.vo.LabelGroupRespVO;
+import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO;
 import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO;
 import com.cf.imes.module.system.dal.dataobject.lable.LabelDO;
 import com.cf.imes.module.system.dal.dataobject.labeltype.LabelTypeDO;
@@ -21,9 +23,10 @@ import com.cf.imes.module.system.dal.dataobject.setting.PackageConfigDO;
 import com.cf.imes.module.system.dal.mysql.label.LabelMapper;
 import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelTemplateMapper;
 import com.cf.imes.module.system.dal.mysql.labeltype.LabelTypeMapper;
+import com.cf.imes.module.system.dal.mysql.dict.DictDataMapper;
 import com.cf.imes.module.system.dal.mysql.machine.MachineMapper;
 import com.cf.imes.module.system.dal.mysql.setting.PackageConfigMapper;
-import com.cf.imes.module.system.enums.label.LabelTemplateType;
+import com.cf.imes.module.system.enums.DictTypeConstants;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -66,6 +69,9 @@ public class LabelServiceImpl implements LabelService {
     @Resource
     private LabelTypeMapper labelTypeMapper;
 
+    @Resource
+    private DictDataMapper dictDataMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createLabel(LabelSaveReqVO createReqVO) {
@@ -237,9 +243,14 @@ public class LabelServiceImpl implements LabelService {
     public void copyInitalLabel(Long organId) {
         List<LabelDO> addList = new ArrayList<>();
 
-        LabelTemplateType[] values = LabelTemplateType.values();
-        for (LabelTemplateType value : values) {
-            String labelType = value.getType();
+        List<DictDataDO> dictDataList = dictDataMapper.selectListByStatusAndDictType(
+                CommonStatusEnum.ENABLE.getStatus(), DictTypeConstants.LABEL_TYPE);
+        for (DictDataDO dictData : dictDataList) {
+            String labelType = dictData.getValue();
+            LabelTypeDO systemLabelType = labelTypeMapper.selectSystemByType(labelType);
+            if (systemLabelType == null) {
+                continue;
+            }
 
             // 获取标签类型的默认模板
             LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectOne(new LambdaQueryWrapperX<LabelTemplateDO>()
@@ -252,7 +263,7 @@ public class LabelServiceImpl implements LabelService {
             // 复制标签内容a
             if (ObjectUtil.isNotNull(labelTemplateDO)) {
                 LabelDO labelDO = LabelDO.builder()
-                        .labelTypeId(labelTypeMapper.selectSystemByType(labelType).getId())
+                        .labelTypeId(systemLabelType.getId())
                         .type(labelType)
                         .name(labelTemplateDO.getName())
                         .remark(labelTemplateDO.getRemark())