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

@@ -9,6 +9,7 @@
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;
   }

   /**