From e9b5e61b2e8e4374f0330d7af5cf57bd2b79d48d Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Wed, 11 Nov 2020 15:15:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=BB=BA=E8=AE=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/MyAdviceListResultDTO.java  | 2 ++
 .../main/java/com/epmet/controller/UserAdviceController.java   | 2 +-
 .../src/main/resources/mapper/UserAdviceDao.xml                | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java
index 77a8e2c460..b6d12a12d4 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java
@@ -18,6 +18,8 @@ public class MyAdviceListResultDTO implements Serializable {
 
     private String adviceContent;
 
+    private String adviceType;
+
     private List<String> imgList;
 
     @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8")
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
index 23ab0d7649..ed52f4da9d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java
@@ -156,7 +156,7 @@ public class UserAdviceController {
 
     /**
      * @Description 居民端-我的建议列表
-     * @param map ->pageSize,pageNo
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyAdviceListResultDTO>>
      * @Author liushaowen
      * @Date 2020/11/9 17:35
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
index f54d2def99..c9c804c0a2 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml
@@ -46,6 +46,7 @@
     <resultMap id="myAdviceListResultMap" type="com.epmet.dto.result.MyAdviceListResultDTO">
         <id column="id"></id>
         <result property="adviceContent" column="ADVICE_CONTENT"/>
+        <result property="adviceType" column="ADVICE_TYPE"/>
         <result property="adviceTime" column="ADVICE_TIME"/>
         <result property="replyContent" column="REPLY_CONTENT"/>
         <result property="replyTime" column="REPLY_TIME"/>
@@ -53,7 +54,7 @@
     </resultMap>
 
     <select id="myAdviceList" resultMap="myAdviceListResultMap">
-        select id,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
+        select id,advice_type,advice_content,advice_time,IFNULL(reply_content,''),IFNULL(reply_time,'')
         from user_advice
         where del_flag = 0 and user_id = #{userId}
         order by created_time desc

From ae46b8ee8ec55551b936061f018ea487c2808202 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 11 Nov 2020 15:16:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BE=BD=E7=AB=A0=E5=AE=A1=E6=A0=B8=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/enums/RequirePermissionEnum.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 284ef67e74..a918d000b0 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -84,6 +84,11 @@ public enum RequirePermissionEnum {
     WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT("work_grassroots_issue_shift_project", "基层治理:议题管理:转项目","转项目（选择处理部门api也需要添加此校验）"),
     WORK_GRASSROOTS_ISSUE_CLOSE("work_grassroots_issue_close","基层治理:议题管理:关闭议题","关闭议题"),
 
+    /**
+     * 徽章
+     */
+    WORK_GRASSROOTS_BADGE_AUDIT("work_grassroots_badge_audit","基层治理:徽章审核:徽章审核","徽章审核权限，目前这个模块的操作都用这一个权限控制，没有细分"),
+
     /**
      * 工作-项目跟踪
      */