From 88682b701cdbeafdc53389b214ff9ade7abdf6a2 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 23 Aug 2024 18:02:01 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 10 ++++++++++ .../iformall/utils/StringContentUtils.java | 20 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/utils/StringContentUtils.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 1431035f6..2679397fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -27,14 +27,21 @@ import com.iformall.enums.EnumYesOrNo; import com.iformall.service.SysConfigService; import com.iformall.service.WxEnergyService; import com.iformall.service.WxFinanceService; +import com.iformall.utils.StringContentUtils; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -317,6 +324,9 @@ public class WxFinanceController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { + if (StringUtils.isNotBlank(record.getMerchantName())) { + record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName())); + } record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); PageInfo page = wxFinanceService.receiveVoListWithBillsAsPage(record, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/utils/StringContentUtils.java b/mallinkService/src/main/java/com/iformall/utils/StringContentUtils.java new file mode 100644 index 000000000..5f32534b0 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/utils/StringContentUtils.java @@ -0,0 +1,20 @@ +package com.iformall.utils; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang3.StringEscapeUtils; + +public class StringContentUtils { + + public static String unescapeHtml(String content) { + Pattern pattern = Pattern.compile("&.*?;"); + Matcher matcher = pattern.matcher(content); + StringBuffer sb = new StringBuffer(); + String result = content; + while (matcher.find()) { + result = result.replaceFirst(matcher.group(), matcher.group().replaceAll(" ", "")); + } + return StringEscapeUtils.unescapeHtml4(result); + } +}