|
@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.dragoninfo.dcuc.app.dto.ResourceRequestParamDTO;
|
|
|
import com.dragoninfo.dcuc.app.facade.IResourceFacade;
|
|
|
-import com.dragoninfo.dcuc.common.entity.ApiPageReq;
|
|
|
import com.dragoninfo.dcuc.common.entity.ApiSearchReq;
|
|
|
import com.dragoninfo.dcuc.common.utils.ResponseUtil;
|
|
|
import com.dragoninfo.dcuc.common.utils.SearchableUtil;
|
|
@@ -173,12 +172,7 @@ public class ApiV1ApproveFacade implements IApiV1ApproveFacade {
|
|
|
requestMap.put("approveNo", new SearchOperator[]{SearchOperator.eq, SearchOperator.in});
|
|
|
Searchable searchable;
|
|
|
try {
|
|
|
- // 为了适配工具类,无其他用途
|
|
|
- ApiPageReq apiPageReq = new ApiPageReq();
|
|
|
- apiPageReq.setFrom(1);
|
|
|
- apiPageReq.setSize(1);
|
|
|
- apiSearchReq.setPage(apiPageReq);
|
|
|
- searchable = SearchableUtil.parseApiSearchReqToSearchable(apiSearchReq, requestMap, 1000);
|
|
|
+ searchable = SearchableUtil.parseApiSearchReqToSearchable(apiSearchReq, requestMap);
|
|
|
searchable.removePageable();
|
|
|
} catch (IllegalArgumentException e) {
|
|
|
String message = e.getMessage();
|