Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java

@@ -9,6 +9,7 @@
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -43,12 +44,12 @@
   @GetMapping("page")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页查询生命周期",notes = "分页查询生命周期")
   public R<IPage<LifeCycleVO>> page(BaseQueryObject baseQueryObject){
      Map<String, String> conditionMap = baseQueryObject.getConditionMap();
   public R<IPage<LifeCycleVO>> page(BladeQueryObject baseQueryObject){
      Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
      if (conditionMap == null){
         conditionMap = new HashMap<>();
      }
      return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getPageHelper()));
      return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getQuery()));
   }