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

epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java

@@ -3,7 +3,6 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.StrangerResiGuideConstant;
 import com.epmet.dto.form.EnterGridFormDTO;
 import com.epmet.dto.form.UserEnterGridFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
@@ -38,26 +37,6 @@ public class UserAccessServiceImpl implements UserAccessService {
         userInfoParams.setGridId(formDTO.getGridId());
         Result<UserInfoOnEnterGridResultDTO> userInfoResult =
                 epmetUserFeignClient.getUserInfoAndRoles(userInfoParams);
-        if(userInfoResult.success()){
-            //2:调用epmet-user服务查询数据 新建网格记录数据
-            /*VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
-            visitedFormDTO.setGridId(userInfoParams.getGridId());
-            visitedFormDTO.setCustomerId(userInfoParams.getCustomerId());
-            visitedFormDTO.setUserId(userInfoParams.getUserId());
-            if(null != userInfoResult.getData().getUserRoleList() && userInfoResult.getData().getUserRoleList().size() > 0){
-                visitedFormDTO.setIsReg(NumConstant.ONE_STR);
-            }else{
-                visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
-            }
-            Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
-            if (!re.success()) {
-                log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
-            }*/
-        }else{
-            //getUserInfoAndRoles调用失败
-            log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
-        }
-
         return userInfoResult;
     }
 }

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

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