Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java

@@ -148,8 +148,7 @@
   @Override
   public List<RevisionRuleVO> listRevisionRuleByIdCollection(Collection<String> revisionRuleIdCollection) throws VciBaseException {
      VciBaseUtil.alertNotNull(revisionRuleIdCollection,"英文名称集合");
//      return RevisionRuleWrapper.build().listVO(list(MybatisParameterUtil.cutInParameter(Wrappers.<RevisionRule>query().lambda(),RevisionRule::getId, Collections.singletonList(revisionRuleIdCollection))));
      List<RevisionRule> list = baseMapper.selectList(Wrappers.<RevisionRule>query().lambda().in(RevisionRule::getId, revisionRuleIdCollection));
      List<RevisionRule> list = baseMapper.selectByIdIgnoreCase(revisionRuleIdCollection);
      return RevisionRuleWrapper.build().listVO(list);
   }

@@ -545,20 +544,8 @@
    * @throws VciBaseException 查询出错时抛出异常
    */
   @Override
   public IPage<RevisionRuleVO> pageQueryVO(BaseQueryObject baseQueryObject) throws VciBaseException {
      Map<String, String> conditionMap = baseQueryObject.getConditionMap();
      if (conditionMap == null){
         conditionMap = new HashMap<>();
      }
      PageHelper pageHelper = baseQueryObject.getPageHelper();
      Query query = new Query();
      query.setCurrent(pageHelper.getPage());
      query.setSize(pageHelper.getLimit());
      query.setAscs(pageHelper.getSort());
      RevisionRule queryConditionObj = new RevisionRule();
      BeanMap beanMap = BeanMap.create(queryConditionObj);
      beanMap.putAll(conditionMap);
      return RevisionRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(queryConditionObj).lambda().orderByAsc(RevisionRule::getId)));
   public IPage<RevisionRuleVO> pageQueryVO(Map<String, Object> condition, Query query) throws VciBaseException {
      return RevisionRuleWrapper.build().pageVO(baseMapper.selectPage(Condition.getPage(query),Condition.getQueryWrapper(condition,RevisionRule.class).lambda().orderByAsc(RevisionRule::getId)));
   }

   /**