Merge branch 'feature' into 'dev'

用户信息过期返回

See merge request !40

src/main/java/com/zhiwei/brandkbs2/enmus/response/LoginCodeEnum.java

@@ -41,11 +41,15 @@ public enum LoginCodeEnum implements ResultCode {
     /**
      * 该账号已过期
      */
-    LOGIN_EXPIRED_ERROR(false, 1008, "该账号已过期", 200),
+    LOGIN_USER_EXPIRED_ERROR(false, 1008, "该账号已过期", 200),
     /**
      * 项目已停用
      */
-    LOGIN_PROJECT_STOPPED_ERROR(false, 1009, "当前项目已停用，请联系管理员恢复", 200);
+    LOGIN_PROJECT_STOPPED_ERROR(false, 1009, "当前项目已停用，请联系管理员恢复", 200),
+    /**
+     * 登录信息过期
+     */
+    LOGIN_EXPIRED_ERROR(false, 1010, "登录信息过期,请重新登陆", 200);
 
     /**
      * 操作是否成功

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -120,7 +120,7 @@ public class UserServiceImpl implements UserService {
     public void addUser(UserDTO userDTO) {
         if (Objects.isNull(userDTO.getRoleId()) || userDTO.getRoleId() < RoleEnum.ADMIN.getState()) {
             // 抛出用户权限设置错误异常
-            ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM,"用户权限设置异常");
+            ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM, "用户权限设置异常");
         }
         int roleId = UserThreadLocal.getRoleId();
         // 只有超管能设置管理员
@@ -140,7 +140,7 @@ public class UserServiceImpl implements UserService {
         } else {
             if (roles.stream().map(UserRole::getProjectId).collect(Collectors.toList()).contains(userDTO.getProjectId())) {
                 // 抛出用户权限设置错误异常
-                ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM,"用户权限设置重复");
+                ExceptionCast.cast(CommonCodeEnum.INVALID_PARAM, "用户权限设置重复");
             }
         }
         roles.add(UserRole.createFromUserDto(userDTO));
@@ -228,7 +228,7 @@ public class UserServiceImpl implements UserService {
             userOldDao.updateOneByIdWithField(userOld.getId(), Update.update("bindUser", true));
             return projectServiceImpl.getProjectListByUser(user, true);
         }
-        List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("userId").is(userOld.getId())));
+        List<UserProjectOldDaoImpl.UserProjectOld> userProjects = userProjectOldDao.findList(new Query(Criteria.where("oldUserId").is(userOld.getId())));
         if (userProjects.isEmpty()) {
             ExceptionCast.cast(CommonCodeEnum.FAIL);
         }
@@ -282,6 +282,11 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public Map<String, Object> getLoginInfo() {
+        String userId = UserThreadLocal.getUserId();
+        String projectId = UserThreadLocal.getProjectId();
+        if (null == userId || null == projectId) {
+            ExceptionCast.cast(LoginCodeEnum.LOGIN_EXPIRED_ERROR);
+        }
         return queryUserInfo(UserThreadLocal.getUserId(), UserThreadLocal.getProjectId()).toMap();
     }