From 341f176dfa66bab4827481bb07d44ba2c47f3eae Mon Sep 17 00:00:00 2001 From: Jc826 Date: Thu, 12 Mar 2020 16:54:14 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20#1438=20=E4=BF=AE=E5=A4=8D=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=B6=88=E6=81=AF=E8=A1=8C=E4=B8=9A=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=B1=BB=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?"=E4=BA=92=E8=81=94=E7=BD=91|=E7=94=B5=E5=AD=90=E5=95=86?= =?UTF-8?q?=E5=8A=A1"=E5=BD=A2=E5=BC=8F=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/template/WxMpTemplateIndustryEnum.java | 2 +- .../weixin/mp/bean/template/WxMpTemplateIndustryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java index 8a0a91371..b3bfcba1b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java @@ -198,7 +198,7 @@ public enum WxMpTemplateIndustryEnum { */ public static WxMpTemplateIndustryEnum findBySecondary(String industry) { for (WxMpTemplateIndustryEnum industryEnum : WxMpTemplateIndustryEnum.values()) { - if (industryEnum.secondClass.equals(industry)) { + if (industryEnum.secondClass.contains(industry)) { return industryEnum; } } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java index d5affa288..eddcfd31b 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java @@ -15,7 +15,7 @@ public class WxMpTemplateIndustryTest { @Test public void testFromJson() { - String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"IT软件与服务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}"; + String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}"; final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json); assertThat(industry).isNotNull(); System.out.println(industry);