From 57cf9ddb496e955a102753138f99a5afec8d194b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 16 Nov 2020 16:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/result/GroupCodeBasicInfoResultDTO.java  |  8 --------
 .../service/impl/ResiGroupCodeServiceImpl.java     | 14 --------------
 .../resources/mapper/group/ResiGroupCodeDao.xml    |  3 +--
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java
index a2c80d4125..b3275408bf 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupCodeBasicInfoResultDTO.java
@@ -32,12 +32,4 @@ public class GroupCodeBasicInfoResultDTO implements Serializable {
      * 小组二维码路径
      */
     private String groupCodeUrl;
-    /**
-     * 小组创建人称谓(街道-姓氏+称谓)(南宁路-李先生)
-     */
-    private String showName;
-    /**
-     * 小组创建人Id
-     */
-    private String groupUserId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
index c1153785c2..5e48167510 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
@@ -75,9 +75,6 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
     @Autowired
     private OssFeignClient ossFeignClient;
 
-    @Autowired
-    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-
     @Override
     public PageData<ResiGroupCodeDTO> page(Map<String, Object> params) {
         IPage<ResiGroupCodeEntity> page = baseDao.selectPage(
@@ -271,17 +268,6 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
             logger.error(String.format("获取小组码基本信息失败，小组Id：%s", formDTO.getGroupId()));
             throw new RenException("获取小组码基本信息失败");
         }
-        //2.获取小组创建人称谓信息
-        UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO();
-        List<String> userIdList = new ArrayList<>();
-        userIdList.add(resultDTO.getGroupUserId());
-        userResiInfoListFormDTO.setUserIdList(userIdList);
-        Result<List<UserResiInfoResultDTO>> resultList = epmetUserOpenFeignClient.getUserResiInfoList(userResiInfoListFormDTO);
-        if (!resultList.success() || null == resultList.getData() || resultList.getData().size() < NumConstant.ONE) {
-            logger.error(String.format("调用user服务，查询用户基本信息失败，userId：%s", resultDTO.getGroupUserId()));
-            throw new RenException("获取小组创建人基本信息失败");
-        }
-        resultDTO.setShowName(resultList.getData().get(NumConstant.ZERO).getShowName());
         return resultDTO;
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
index 2dcabe93b5..685f645b92 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
@@ -9,8 +9,7 @@
             rgc.URL AS "groupCodeUrl",
             rg.GROUP_NAME AS "groupName",
             rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto",
-            rg.GROUP_INTRODUCTION AS "groupIntroduction",
-            rg.CREATED_BY AS "groupUserId"
+            rg.GROUP_INTRODUCTION AS "groupIntroduction"
         FROM
             resi_group_code rgc
         INNER JOIN resi_group rg ON rgc.GROUP_ID = rg.ID