Merge remote-tracking branch 'remotes/origin/dev_optimize_ljj' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1024,9 +1024,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 			}
 			if (userInfo == null) {
 				logger.error("recommendedList 用户基础信息不存在,customerUserId:{}", groupMemberDTO.getCustomerUserId());
-				UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
-				resiUserInfoFormDTO.setUserId(groupMemberDTO.getCustomerUserId());
-				Result<UserResiInfoResultDTO> groupLeaderUserInfo = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
+				Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId());
 
 				if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 					dto.setLeaderName(groupLeaderUserInfo.getData().getShowName());

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@@ -33,7 +33,6 @@ import com.epmet.dto.result.IssueInitiatorResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
-import jdk.nashorn.internal.parser.Token;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -60,7 +60,12 @@
     <!--  根据app、openId查询用户是否存在  -->
     <select id="selectUserDTOByOpenId" parameterType="com.epmet.dto.form.WxLoginUserInfoFormDTO" resultType="com.epmet.dto.UserDTO">
         SELECT
-            u.*
+            u.ID,
+            u.CUSTOMER_ID,
+            u.FROM_APP,
+            u.FROM_CLIENT,
+            u.CREATED_TIME,
+            u.CREATED_BY
         FROM
             USER u
             LEFT JOIN user_wechat uw ON (
@@ -74,7 +79,7 @@
 
     <select id="selectByUserId" parameterType="string" resultType="com.epmet.entity.UserWechatEntity">
         SELECT *
-        
+
         FROM
               USER_WECHAT
         WHERE