From d3c0b582d280ef5db652b1edfab8312e630cc4fb Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 23 Apr 2019 19:01:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AE=8C=E5=96=84=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxFlowAbleController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index 0704cd3d1..4c0f8b7d4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.domain.po.WxFlowRecord; @@ -9,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -95,7 +97,14 @@ public class WxFlowAbleController extends BaseController { logger.debug("[" + getIpAddr() + "] FlowAbleController::myHandelList"); record.setUserId(super.getUser().getId()); record.setStatus(EnumFlowRecordStatus.NEW.getCode()); - return new ResultData(wxFlowService.myHandelList(record,pageNum,pageSize)); + PageInfo pageInfo = wxFlowService.myHandelList(record,pageNum,pageSize); + List recordList = pageInfo.getList(); + for (WxFlowRecord wxFlowRecord:recordList) { + if(StringUtils.isBlank(wxFlowRecord.getVariables())){ + wxFlowRecord.setVariables("{}"); + } + } + return new ResultData(pageInfo); }