From 5ecd9601eab852d663d0085cc42ec37b5aaae294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 5 Dec 2019 15:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +-
 .../elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java | 5 +++++
 .../src/main/resources/mapper/item/ItemDao.xml               | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index bd60ddfa0..555ebbc93 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -136,7 +136,7 @@ public class AppUserServiceImpl implements AppUserService {
         try {
             String url = "pages/index/index?gridId=" + formDto.getGridId().toString();
             url = url+"&inviteUserId=" + formDto.getInviteUserId();
-            wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCodeUnlimit("", url);
+            wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCode(url);
         } catch (WxErrorException e) {
             throw new RenException("请求微信接口失败");
         }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
index 373476eca..8c4196c82 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
@@ -23,6 +23,11 @@ public class ItemDetailResultDTO implements Serializable {
      * 事件ID
      */
     private String eventId;
+
+    /**
+     *议题ID
+     */
+    private String issueId;
     /**
      * 发布时间
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index c093b54e3..c0fdcbf8d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -259,6 +259,7 @@
     <resultMap id="itemDetailMap" type="com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO">
         <result property="id" column="ID"/>
         <result property="eventId" column="EVENT_ID"/>
+        <result property="issueId" column="ISSUE_ID"/>
         <result property="userLike" column="userLike"/>
         <result property="userDislike" column="userDislike"/>
         <result property="content" column="ITEM_CONTENT"/>
@@ -483,6 +484,7 @@
             eve.BROWSE_NUM,
             ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum,
             item.EVENT_ID,
+            item.ISSUE_ID,
             img.IMG_URL
 
         FROM