no message

@@ -20,6 +20,7 @@ import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.IEntiretyService;
 import com.lego.core.service.IEntiretyService;
 import io.micrometer.core.instrument.util.StringUtils;
 import io.micrometer.core.instrument.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
@@ -93,18 +94,15 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
      */
      */
     @Override
     @Override
     public List<BuildingBlockVo> list(String language, Collection<String> entiretyIds) {
     public List<BuildingBlockVo> list(String language, Collection<String> entiretyIds) {
-        if(StringUtils.isBlank(language))
-            language = "zh_CN";
+        List<BuildingBlockVo> list = Lists.newArrayList();
         if(!CollectionUtils.isEmpty(entiretyIds)) {
         if(!CollectionUtils.isEmpty(entiretyIds)) {
-            List<BuildingBlockVo> list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language).in(BuildingBlock::getEntiretyId, entiretyIds));
-            setInfo(list);
-            return list;
+            list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language).in(BuildingBlock::getEntiretyId, entiretyIds));
         }
         }
         else{
         else{
-            List<BuildingBlockVo> list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language));
-            setInfo(list);
-            return list;
+            list = baseMapper.selectVoList(Wrappers.<BuildingBlock>lambdaQuery().eq(BuildingBlock::getLanguage, language));
         }
         }
+        setInfo(list);
+        return list;
     }
     }
 
 
     /**
     /**

@@ -21,6 +21,7 @@ import com.lego.core.mapper.BuildingBlockMapper;
 import com.lego.core.mapper.EntiretyMapper;
 import com.lego.core.mapper.EntiretyMapper;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.IBuildingBlockService;
 import com.lego.core.service.IEntiretyService;
 import com.lego.core.service.IEntiretyService;
+import io.micrometer.core.instrument.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -52,6 +53,8 @@ public class EntiretyServiceImpl implements IEntiretyService {
      */
      */
     @Override
     @Override
     public TableDataInfo<EntiretyVo> listPage(PageQuery query, String language) {
     public TableDataInfo<EntiretyVo> listPage(PageQuery query, String language) {
+        if(StringUtils.isBlank(language))
+            language = "zh_CN";
         Page<EntiretyVo> page = baseMapper.selectVoPage(query.build(), Wrappers.<Entirety>lambdaQuery()
         Page<EntiretyVo> page = baseMapper.selectVoPage(query.build(), Wrappers.<Entirety>lambdaQuery()
                 .eq(Entirety::getLanguage, language).orderByAsc(Entirety::getSort));
                 .eq(Entirety::getLanguage, language).orderByAsc(Entirety::getSort));
         /**
         /**