Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java

@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.system.entity.Combination;
import com.vci.ubcs.system.mapper.CombinationMapper;
import com.vci.ubcs.system.service.ICombinationService;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -55,7 +56,9 @@
    */
   @Override
   public IPage<Combination> selectCombinationPage(Combination combination, IPage<Combination> page) {
      return page.setRecords(combinationMapper.selectCombinationPage(page,combination));
      IPage<Combination> combinationIPage = combinationMapper.selectPage(page, Condition.getQueryWrapper(combination));
      // page.setRecords(combinationMapper.selectCombinationPage(page,combination))
      return combinationIPage;
   }

   /**
@@ -110,7 +113,9 @@
    */
   @Override
   public List<Map<String, Object>> selectMaps() {
      List<Map<String, Object>> maps = listMaps(new QueryWrapper<Combination>().select("ID", "NAME"));
      List<Map<String, Object>> maps = listMaps(
         new QueryWrapper<Combination>().lambda().select(Combination::getId, Combination::getName)
      );
      return maps;
   }