提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -205,7 +205,7 @@ public class UserController extends BaseController {
                                     HttpSession session){
         ResponseBean response = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        response = iTaUserService.getUserInfo(userElement.getId(),userId);
+        response = iTaUserService.getUserInfo(userElement,userId);
         TaUserVO userVO = (TaUserVO) response.getData();
         userVO.setToken(session.getId());
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -107,11 +107,11 @@ public interface ITaUserService {
 
     /**
      * 获取用户信息
-     * @param currenUserId 当前用户
+     * @param userElement 当前用户
      * @param userId 被查询用户, 一般是业主情况下有效, 查的是下面的家属或者租客
      * @return
      */
-    ResponseBean getUserInfo(Integer currenUserId,Integer userId);
+    ResponseBean getUserInfo(UserElement userElement,Integer userId);
 
     /**
      * 游客登录

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -838,16 +838,12 @@ public class TaUserServiceImpl implements ITaUserService {
     }
 
     @Override
-    public ResponseBean getUserInfo(Integer currentUserId,Integer userId) {
+    public ResponseBean getUserInfo(UserElement userElement,Integer userId) {
 
         ResponseBean response = new ResponseBean();
-        if (null == currentUserId) {
-            response.addError("用户id不存在!");
-            return response;
-        }
 
         // 获取用户
-        TaUser user = taUserMapper.selectByPrimaryKey(currentUserId);
+        TaUser user = taUserMapper.selectByPrimaryKey(userElement.getId());
         TaUser todUser = null;
         if (null != userId) {
             todUser = taUserMapper.selectByPrimaryKey(userId);