From 3c9b4a77e110e37eea3054e554165b03a62cfe94 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 29 Apr 2021 14:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9grouptypelist=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E4=BC=98=E5=85=88=E6=9F=A5=E8=AF=A2=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=AE=A2=E6=88=B7=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E5=AE=A2=E6=88=B7=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2default=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/group/service/impl/ResiGroupSetupServiceImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java
index aa5bc80aef..77ac999897 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.modules.group.entity.ResiGroupSetupEntity;
 import com.epmet.modules.group.redis.ResiGroupSetupRedis;
 import com.epmet.modules.group.service.ResiGroupSetupService;
 import com.epmet.resi.group.dto.group.result.GroupTypeListResultDTO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +60,9 @@ public class ResiGroupSetupServiceImpl extends BaseServiceImpl<ResiGroupSetupDao
 
         //初期所有客户共用一套建组设置，客户Id为default，后边可以根据token用户所属客户查询
         List<GroupTypeListResultDTO.SetUp> list = baseDao.selectGroupList(customerId);
+        if(CollectionUtils.isEmpty(list)){
+            list = baseDao.selectGroupList(GroupActConstant.DEFAULT_CUSTOMER_ID);
+        }
         list.forEach(l -> {
             if ("ordinary".equals(l.getGroupType())) {
                 commonUsedGroup.add(l);