|
|
|
@ -1710,7 +1710,7 @@ public class HrmSelfHelpController {
|
|
|
|
|
int pageNo = CommonUtils.getIntValue(request.getParameter("pageNo"),1);
|
|
|
|
|
// 0 我发起的; 1 我的待办; 2 我的已办
|
|
|
|
|
if("0".equals(type)){
|
|
|
|
|
WeaResult<List<RequestListInfoPAEntity>> requestResult = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.PORTAL_MINE.getTabid(), pageNo, pageSize, conditionEntity);
|
|
|
|
|
WeaResult<List<RequestListInfoPAEntity>> requestResult = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.MINE_FLOWALL.getTabid(), pageNo, pageSize, conditionEntity);
|
|
|
|
|
int code = requestResult.getCode();
|
|
|
|
|
if(code == 200){
|
|
|
|
|
requestListInfoPAEntityList = requestResult.getData();
|
|
|
|
@ -1756,7 +1756,7 @@ public class HrmSelfHelpController {
|
|
|
|
|
int pageNo = CommonUtils.getIntValue(request.getParameter("pageNo"),1);
|
|
|
|
|
// 0 我发起的; 1 我的待办; 2 我的已办
|
|
|
|
|
|
|
|
|
|
WeaResult<List<RequestListInfoPAEntity>> requestResult0 = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.PORTAL_MINE.getTabid(), pageNo, pageSize, conditionEntity);
|
|
|
|
|
WeaResult<List<RequestListInfoPAEntity>> requestResult0 = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.MINE_FLOWALL.getTabid(), pageNo, pageSize, conditionEntity);
|
|
|
|
|
int code0 = requestResult0.getCode();
|
|
|
|
|
if(code0 == 200){
|
|
|
|
|
List<RequestListInfoPAEntity> requestList0 = requestResult0.getData();
|
|
|
|
|