|
|
@@ -2,7 +2,6 @@ package com.lc.ibps.office.provider;
|
|
|
|
|
|
import com.lc.ibps.api.base.constants.StateEnum;
|
|
|
import com.lc.ibps.api.base.model.PartyEntity;
|
|
|
-import com.lc.ibps.api.base.page.Page;
|
|
|
import com.lc.ibps.api.base.query.QueryFilter;
|
|
|
import com.lc.ibps.api.base.query.QueryOP;
|
|
|
import com.lc.ibps.base.core.exception.BaseException;
|
|
|
@@ -30,6 +29,7 @@ import com.lc.ibps.bpmn.repository.BpmInstRepository;
|
|
|
import com.lc.ibps.bpmn.repository.BpmTaskRepository;
|
|
|
import com.lc.ibps.bpmn.utils.PartyUtil;
|
|
|
import com.lc.ibps.cloud.entity.APIPageList;
|
|
|
+import com.lc.ibps.cloud.entity.APIPageResult;
|
|
|
import com.lc.ibps.cloud.entity.APIRequest;
|
|
|
import com.lc.ibps.cloud.entity.APIResult;
|
|
|
import com.lc.ibps.cloud.provider.GenericProvider;
|
|
|
@@ -628,7 +628,7 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
|
|
|
APIRequest request = new APIRequest();
|
|
|
// 根据桌面组件配置 是否分页查询
|
|
|
Map<String,Object> config = commonDao.queryOne("SELECT NEED_PAGE_ from IBPS_DESKTOP_COLUMN WHERE ALIAS_='pendingMatters'");
|
|
|
- if(config != null && config.get("needPage") != null && config.get("NEED_PAGE_").equals("Y")) {
|
|
|
+ if(config != null && config.get("NEED_PAGE_") != null && config.get("NEED_PAGE_").equals("Y")) {
|
|
|
request = new APIRequest(1,20);
|
|
|
}
|
|
|
try {
|
|
|
@@ -641,8 +641,10 @@ public class BpmReceivedProvider extends GenericProvider implements IBpmReceived
|
|
|
this.getExpired(list);
|
|
|
|
|
|
APIPageList<BpmTaskPo> apiPageList = this.getAPIPageList(list);
|
|
|
- if (BeanUtils.isNotEmpty(list) && list.size() < 20) {
|
|
|
- apiPageList.getPageResult().setTotalCount(list.size());
|
|
|
+ if (BeanUtils.isNotEmpty(list)) {
|
|
|
+ if (BeanUtils.isEmpty(apiPageList.getPageResult())){
|
|
|
+ apiPageList.setPageResult(new APIPageResult(1,list.size(),list.size()));
|
|
|
+ }
|
|
|
}
|
|
|
result.setData(apiPageList);
|
|
|
} catch(Exception e) {
|
gaozl