用户登录返回科室信息

bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java

@@ -4,6 +4,7 @@ import com.bsoft.api.common.utils.TokenUtil;
 import com.bsoft.api.mapper.DicOrgMapper;
 import com.bsoft.api.mapper.SysUserMapper;
 import com.bsoft.api.model.DicOrg;
+import com.bsoft.api.model.SerDepartment;
 import com.bsoft.api.model.SysUser;
 import com.bsoft.api.service.LoginService;
 import com.bsoft.api.service.UserService;
@@ -27,13 +28,13 @@ public class LoginServiceImpl implements LoginService {
     private DicOrgMapper dicOrgMapper;
 
     @Override
-    public LoginInfo login(String logName,String password,String ip) {
+    public LoginInfo login(String logName, String password, String ip) {
 
         LoginInfo loginInfo = new LoginInfo();
 
         SysUser user = userServiceImpl.findByLoginName(logName);
-        if(user != null && user.getPassword().equals(password)){
-            String token = TokenUtil.getToken(password,user);
+        if (user != null && user.getPassword().equals(password)) {
+            String token = TokenUtil.getToken(password, user);
             //修改ip以及最后登录时间
             user.setLastIp(ip);
             user.setLastTime(new Date());
@@ -44,6 +45,10 @@ public class LoginServiceImpl implements LoginService {
             loginInfo.setUser(user);
             //查询用户机构
             List<DicOrg> orgList = dicOrgMapper.selectByUser(user.getId());
+            if (orgList != null && orgList.size() > 0) {
+                List<SerDepartment> deptList = dicOrgMapper.selectDeptByUser(user.getId(), orgList.get(0).getId());
+                loginInfo.setDept(deptList != null && deptList.size() > 0 ? deptList.get(0) : null);
+            }
             loginInfo.setOrg(orgList);
         }
         return loginInfo;

bsoft-api/src/main/java/com/bsoft/api/service/LoginService.java

 package com.bsoft.api.service;
 
 import com.bsoft.api.model.DicOrg;
+import com.bsoft.api.model.SerDepartment;
 import com.bsoft.api.model.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +11,7 @@ import java.util.List;
 public interface LoginService {
 
 
-    LoginInfo login(String loginName,String password,String ip);
+    LoginInfo login(String loginName, String password, String ip);
 
     String refreshToken(String oldToken);
 
@@ -22,12 +23,13 @@ public interface LoginService {
         private SysUser user;
         @ApiModelProperty("用户机构信息")
         private List<DicOrg> org;
-
+        @ApiModelProperty("用户科室信息")
+        private SerDepartment dept;
 
         public LoginInfo() {
         }
 
-        public LoginInfo(String token,SysUser user,List<DicOrg> org) {
+        public LoginInfo(String token, SysUser user, List<DicOrg> org) {
             this.token = token;
             this.user = user;
             this.org = org;
@@ -57,12 +59,21 @@ public interface LoginService {
             this.org = org;
         }
 
+        public SerDepartment getDept() {
+            return dept;
+        }
+
+        public void setDept(SerDepartment dept) {
+            this.dept = dept;
+        }
+
         @Override
         public String toString() {
             return "LoginInfo{" +
                     "token='" + token + '\'' +
                     ", user=" + user +
                     ", org=" + org +
+                    ", dept=" + dept +
                     '}';
         }
     }