lihang
2023-06-15 b48356e1b39f8e812f85d1627c0fc18e1f4d58ba
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/RevisionRuleClient.java
@@ -13,6 +13,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -54,7 +55,16 @@
   @GetMapping(GET_REF_PAGE)
   @Override
   public R<IPage<RevisionRuleVO>> getRefPage(BaseQueryObject baseQueryObject) {
      return R.data(service.pageQueryVO(baseQueryObject));
      Map<String, String> conditionMap = baseQueryObject.getConditionMap();
      if (conditionMap == null){
         conditionMap = new HashMap<>();
      }
      Query query = new Query();
      query.setSize(baseQueryObject.getLimit());
      query.setCurrent(baseQueryObject.getPage());
      Map<String,Object> condition = new HashMap<>();
      BeanUtil.copy(conditionMap,condition);
      return R.data(service.pageQueryVO(condition,query));
   }
   /**