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 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);