| @@ -1,5 +1,6 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | |||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxFlowRecord; | import com.iformall.domain.po.WxFlowRecord; | ||||
| @@ -9,6 +10,7 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.apache.commons.lang3.StringUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -95,7 +97,14 @@ public class WxFlowAbleController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] FlowAbleController::myHandelList"); | logger.debug("[" + getIpAddr() + "] FlowAbleController::myHandelList"); | ||||
| record.setUserId(super.getUser().getId()); | record.setUserId(super.getUser().getId()); | ||||
| record.setStatus(EnumFlowRecordStatus.NEW.getCode()); | record.setStatus(EnumFlowRecordStatus.NEW.getCode()); | ||||
| return new ResultData(wxFlowService.myHandelList(record,pageNum,pageSize)); | |||||
| PageInfo<WxFlowRecord> pageInfo = wxFlowService.myHandelList(record,pageNum,pageSize); | |||||
| List<WxFlowRecord> recordList = pageInfo.getList(); | |||||
| for (WxFlowRecord wxFlowRecord:recordList) { | |||||
| if(StringUtils.isBlank(wxFlowRecord.getVariables())){ | |||||
| wxFlowRecord.setVariables("{}"); | |||||
| } | |||||
| } | |||||
| return new ResultData(pageInfo); | |||||
| } | } | ||||