From 48c2aa20ed871d14f35f32abf1b08b6477054942 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 10 Jun 2022 09:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E5=AD=97=E7=A4=BE=E5=8C=BA=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6groupId=20=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcFormServiceImpl.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
index 6002398fbd..0523b83600 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
@@ -175,6 +175,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         if (CollectionUtils.isEmpty(itemList)) {
             return "默认配置错误";
         }
+        String defaultBaseInfoGroupId = "default_0";
         //设置ic_form_item
         itemList.forEach(item -> {
             item.setId(newPrefixed + item.getId());
@@ -183,7 +184,10 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             item.setAreaCode(areaCode);
             item.setParentItemId(newPrefixed + item.getParentItemId());
             //分组Id 为0 说明不村子分组 则直接不设置 仍然为0
-            if (!NumConstant.ZERO_STR.equals(item.getItemGroupId())){
+            //基础信息分组id:default_0;默认是客户id_0
+            if (defaultBaseInfoGroupId.equals(item.getItemGroupId())) {
+                item.setItemGroupId(customerId.concat("_0"));
+            } else {
                 item.setItemGroupId(newPrefixed + item.getItemGroupId());
             }
             String optionSourceValue = item.getOptionSourceValue();
@@ -227,7 +231,12 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode);
         List<IcFormItemGroupEntity> groupList = icFormItemGroupDao.selectList(wrapperGroup);
         groupList.forEach(item -> {
-            item.setId(newPrefixed + item.getId());
+            if (defaultBaseInfoGroupId.equals(item.getId())) {
+                //基础信息分组id默认客户id_0
+                item.setId(customerId.concat("_0"));
+            } else {
+                item.setId(newPrefixed + item.getId());
+            }
             item.setCustomerId(customerId);
             item.setFormId(newFormId);
             item.setCreatedBy("init_user");