From 6a318d53c52f97689fe1452f438c634f7939b12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 12 May 2020 09:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/group/dao/UserGroupDao.java    | 12 ++++++++++--
 .../group/service/impl/UserGroupServiceImpl.java     |  8 ++++++--
 .../src/main/resources/mapper/group/UserGroupDao.xml |  5 ++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java
index 5c86ca4..6b9c13c 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/UserGroupDao.java
@@ -132,6 +132,14 @@ public interface UserGroupDao extends BaseDao<UserGroupEntity> {
      * @author qushutong
      * @date 2020/5/11 15:41
      */
-    void updataGroupOwner(GroupToAdminFormDTO formDTO);
-	
+    void updateGroupOwner(GroupToAdminFormDTO formDTO);
+
+    /***
+     * 移除此群群主
+     * @param formDTO
+     * @return void
+     * @author qushutong
+     * @date 2020/5/12 9:10
+     */
+    void updateRemoveGroupOwner(GroupToAdminFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java
index 92d3609..2405abf 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/UserGroupServiceImpl.java
@@ -313,7 +313,7 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
         Map map= new HashMap();
         if(integer>0){
             map.put("resultCode",1);
-            map.put("resultMessage","此群已经有群主 是否替换？");
+            map.put("resultMessage","此群已有群主 是否替换？");
             return new Result().ok(map);
         }
         map.put("resultCode",0);
@@ -321,8 +321,12 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result modifyGroupOwner(GroupToAdminFormDTO formDTO) {
-        baseDao.updataGroupOwner(formDTO);
+        //移除此群群主
+        baseDao.updateRemoveGroupOwner(formDTO);
+        //指定群主
+        baseDao.updateGroupOwner(formDTO);
         return new Result();
     }
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/group/UserGroupDao.xml b/epdc-cloud-property/src/main/resources/mapper/group/UserGroupDao.xml
index 4a8abae..7c48038 100644
--- a/epdc-cloud-property/src/main/resources/mapper/group/UserGroupDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/group/UserGroupDao.xml
@@ -110,8 +110,11 @@
         AND ug.GROUP_ID = #{groupId}
     </select>
 
-    <update id="updataGroupOwner">
+    <update id="updateGroupOwner">
         UPDATE epdc_user_group SET LORD_FLAG = 1 WHERE ID = #{id}
     </update>
 
+    <update id="updateRemoveGroupOwner">
+        update epdc_user_group ug SET LORD_FLAG = 0 WHERE ug.GROUP_ID = #{groupId} AND ug.LORD_FLAG = 1
+    </update>
 </mapper>