Merge branch 'master' of http://git.sundot.cn/haikou/meilan-server

airport-admin/src/main/java/com/sundot/airport/web/core/cache/UserCache.java

@@ -85,12 +85,15 @@ public class UserCache {
         }
         Collections.reverse(deptList);
         SysDept teams = deptList.stream().filter(x -> StrUtil.equals(DeptType.TEAMS.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
-        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.DEPARTMENT.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.MANAGER.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(DeptType.BRIGADE.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
         SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
         userInfo.setTeamsId(teams.getDeptId());
         userInfo.setTeamsName(teams.getDeptName());
         userInfo.setDepartmentId(department.getDeptId());
         userInfo.setDepartmentName(department.getDeptName());
+        userInfo.setBrigadeId(brigade.getDeptId());
+        userInfo.setBrigadeName(brigade.getDeptName());
         userInfo.setStationId(station.getDeptId());
         userInfo.setStationName(station.getDeptName());
     }

airport-common/src/main/java/com/sundot/airport/common/dto/UserInfo.java

@@ -62,6 +62,16 @@ public class UserInfo {
     private String departmentName;
 
     /**
+     * 大队 id
+     */
+    private Long brigadeId;
+
+    /**
+     * 大队名称
+     */
+    private String brigadeName;
+
+    /**
      * 机构站 id
      */
     private Long stationId;

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysUserServiceImpl.java

@@ -543,20 +543,25 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         Collections.reverse(deptList);
         SysDept teams = deptList.stream().filter(x -> StrUtil.equals(DeptType.TEAMS.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
-        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.DEPARTMENT.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept department = deptList.stream().filter(x -> StrUtil.equals(DeptType.MANAGER.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
+        SysDept brigade = deptList.stream().filter(x -> StrUtil.equals(DeptType.BRIGADE.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
         SysDept station = deptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(new SysDept());
         userInfo.setTeamsId(teams.getDeptId());
         userInfo.setTeamsName(teams.getDeptName());
         userInfo.setDepartmentId(department.getDeptId());
         userInfo.setDepartmentName(department.getDeptName());
+        userInfo.setBrigadeId(brigade.getDeptId());
+        userInfo.setBrigadeName(brigade.getDeptName());
         userInfo.setStationId(station.getDeptId());
         userInfo.setStationName(station.getDeptName());
 
         Long deptId;
         if (StrUtil.equals(DeptType.TEAMS.getCode(), deptType)) {
             deptId = userInfo.getTeamsId();
-        } else if (StrUtil.equals(DeptType.DEPARTMENT.getCode(), deptType)) {
+        } else if (StrUtil.equals(DeptType.MANAGER.getCode(), deptType)) {
             deptId = userInfo.getDepartmentId();
+        } else if (StrUtil.equals(DeptType.BRIGADE.getCode(), deptType)) {
+            deptId = userInfo.getBrigadeId();
         } else if (StrUtil.equals(DeptType.STATION.getCode(), deptType)) {
             deptId = userInfo.getStationId();
         } else {
@@ -607,7 +612,7 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserListByRoleKey(List<String> roleKeyList) {
         return userMapper.selectUserListByRoleKey(roleKeyList);
     }
-    
+
     @Override
     public List<SysUser> selectUserListByRoleKeyAndDeptId(List<String> roleKeyList, Long stationId) {
         return userMapper.selectUserListByRoleKeyAndDeptId(roleKeyList, stationId);