From 17aaba249645ab64c77f2deb0d7937a7d6bed447 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 30 May 2020 21:59:32 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E5=BE=AE=E4=BF=A1=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=A1=8C=E4=B8=9A=E8=8E=B7=E5=8F=96=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/bean/template/WxMpTemplateIndustryEnum.java  | 7 ++++---
 .../weixin/mp/util/json/WxMpIndustryGsonAdapter.java       | 5 +++--
 2 files changed, 7 insertions(+), 5 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 022551d64..6620d86aa 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
@@ -193,12 +193,13 @@ public enum WxMpTemplateIndustryEnum {
   /**
    * 查找行业
    *
-   * @param industry 二级行业名称
+   * @param firstClass  主行业名称
+   * @param secondClass 副行业名称
    * @return .
    */
-  public static WxMpTemplateIndustryEnum findBySecondary(String industry) {
+  public static WxMpTemplateIndustryEnum findByClass(String firstClass, String secondClass) {
     for (WxMpTemplateIndustryEnum industryEnum : WxMpTemplateIndustryEnum.values()) {
-      if (industryEnum.secondClass.contains(industry)) {
+      if (industryEnum.firstClass.equals(firstClass) && industryEnum.secondClass.contains(secondClass)) {
         return industryEnum;
       }
     }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
index 9c418c2a6..30ac9c1a7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
@@ -28,8 +28,9 @@ public class WxMpIndustryGsonAdapter implements JsonSerializer<WxMpTemplateIndus
   }
 
   private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
+    String firstClass = GsonHelper.getString(json, "first_class");
     String secondClass = GsonHelper.getString(json, "second_class");
-    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);
     if (industryEnum != null) {
       return industryEnum;
     }
@@ -38,7 +39,7 @@ public class WxMpIndustryGsonAdapter implements JsonSerializer<WxMpTemplateIndus
       secondClass = secondClass.split("\\|")[1];
     }
 
-    return WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    return WxMpTemplateIndustryEnum.findByClass(firstClass, secondClass);
   }
 
 }