登录返回用户信息

user-service/src/main/java/com/diagbot/dto/LoginDTO.java

@@ -1,29 +1,19 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @Description: 登录输出类
  * @author: gaodm
  * @time: 2018/8/2 14:22
  */
+@Getter
+@Setter
 public class LoginDTO {
     private User user;
     private String token;
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
+    private Organization organization;
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -112,6 +112,8 @@ public class UserFacade extends UserServiceImpl {
         LoginDTO loginDTO=new LoginDTO();
         loginDTO.setUser(user);
         loginDTO.setToken(jwt.getAccess_token());
+        Organization org = organizationMapper.getByUserId(user.getId());
+        loginDTO.setOrganization(org);
         return RespDTO.onSuc(loginDTO);
     }
 

user-service/src/main/java/com/diagbot/mapper/OrganizationMapper.java

@@ -10,4 +10,11 @@ import com.diagbot.entity.Organization;
  */
 public interface OrganizationMapper extends BaseMapper<Organization> {
 
+    /**
+     * @Description: 通过用户id获取组织结构
+     * @Author: ztg
+     * @Date: 2018/9/13 19:24
+     */
+    public Organization getByUserId(Long userId);
+
 }

user-service/src/main/resources/mapper/OrganizationMapper.xml

@@ -13,4 +13,8 @@
         <result column="name" property="name" />
     </resultMap>
 
+    <select id="getByUserId" resultMap="BaseResultMap">
+        SELECT a.* FROM `sys_organization` a, sys_user_organization b
+        where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
+    </select>
 </mapper>