Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/BtmTypeClient.java

@@ -78,12 +78,13 @@
      String domainValue = conditionMap.get(DOMAIN);
      VciBaseUtil.alertNotNull(domainValue,"领域值");
      conditionMap.remove(DOMAIN);
      BtmType queryObj = new BtmType();
      BeanMap.create(queryObj).putAll(conditionMap);
//      BtmType queryObj = new BtmType();
//      BeanMap.create(queryObj).putAll(conditionMap);
      Map<String, Object> condition = new HashMap<>(conditionMap);
      Query query = new Query();
      query.setSize(pageHelper.getLimit());
      query.setCurrent(pageHelper.getPage());
      IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(queryObj).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
      IPage<BtmType> page = btmTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(condition,BtmType.class).lambda().eq(BtmType::getDomain, domainValue).orderByAsc(BtmType::getId));
      if (CollectionUtils.isEmpty(page.getRecords())){
         return R.data(null);
      }