From b66bf3dd77a0267623bed0a18da5b0af2e2f8397 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 19 Dec 2019 18:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-admin/epdc-admin-server/pom.xml            | 4 ++--
 esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml    | 4 ++--
 .../epdc-module/epdc-events/epdc-events-server/pom.xml    | 4 ++--
 .../modules/group/service/impl/GroupServiceImpl.java      | 8 ++++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
index 452668612..ad1675134 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml
@@ -154,8 +154,8 @@
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
+                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
             </properties>
         </profile>
         <profile>
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index 24ffc2c20..e5fb73433 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -201,8 +201,8 @@
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
+                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
             </properties>
         </profile>
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 6a2876035..2886ef786 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -182,8 +182,8 @@
                 <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>
                 <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
-                <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
+                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
             </properties>
         </profile>
 
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
index 1399dc0fe..ad83e3564 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java
@@ -374,6 +374,14 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
             if (null == groupDto) {
                 continue;
             }
+            // 获取群主信息
+            UserGroupDTO lordInfo = userGroupService.getLordInfoByGroupId(groupDto.getId());
+            if (null != lordInfo) {
+                // 更新旧群主信息
+                UserGroupEntity userGroupEntity = ConvertUtils.sourceToTarget(lordInfo, UserGroupEntity.class);
+                userGroupEntity.setLordFlag(NumConstant.ZERO_STR);
+                updateEntity.add(userGroupEntity);
+            }
             // 校验用户是否已加入党员群
             int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
             UserGroupDTO userGroupDto = userGroupService.getGroupUserInfo(groupDto.getId(), formDto.getUserId(), states);