From 1030b6ff083856bbe8535b0f97cdce1c07690259 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 20 Jun 2022 09:51:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96openId=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
index 81edf12a9a..5a4b39f502 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java
@@ -544,7 +544,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                 throw new WxSubscribeException("clientType有误", "", openId);
             }
         } catch (Exception e) {
-            log.error("method exception", e);
+            log.warn("method exception,msg:{}", e.getMessage());
             throw new WxSubscribeException("获取openId失败:" + e.getMessage(), "", "");
         }
         return openId;

From 3378796d56ccc17c594e619300e5b790b251eadf Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 20 Jun 2022 15:04:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/project/ProjectProcessDao.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
index a1e6a233d0..2ee065b4b5 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.project.ProjectProcessDao">
 
     <select id="selectProcessList" resultType="com.epmet.entity.project.ProjectProcessEntity">
-        SELECT
+        SELECT DISTINCT
             pro.project_id AS "projectId",
             pro.operation AS "operation",
             DATE_FORMAT(pro.created_time, "%Y-%m-%d") AS "createdTime",