fix:修复用户无部门、角色或岗位时无法编辑及无法登录的bug

Author: insistence

dash-fastapi-backend/module_admin/annotation/log_annotation.py

@@ -136,7 +136,7 @@ async def wrapper(*args, **kwargs):
                 else:
                     current_user = await get_current_user(request, token, query_db)
                     oper_name = current_user.user.user_name
-                    dept_name = current_user.dept.dept_name
+                    dept_name = current_user.dept.dept_name if current_user.dept else None
                     operation_log = dict(
                         title=title,
                         business_type=business_type,

dash-fastapi-backend/module_admin/controller/login_controller.py

@@ -38,7 +38,7 @@ async def login(request: Request, form_data: CustomOAuth2PasswordRequestForm = D
             data={
                 "user_id": str(result[0].user_id),
                 "user_name": result[0].user_name,
-                "dept_name": result[1].dept_name,
+                "dept_name": result[1].dept_name if result[1] else None,
                 "session_id": session_id,
                 "login_info": user.login_info
             },

dash-fastapi-backend/module_admin/dao/user_dao.py

@@ -6,7 +6,7 @@
 from module_admin.entity.do.post_do import SysPost
 from module_admin.entity.do.menu_do import SysMenu
 from module_admin.entity.vo.user_vo import UserModel, UserRoleModel, UserPostModel, CurrentUserInfo, UserQueryModel, UserRoleQueryModel
-from utils.time_format_util import list_format_datetime, format_datetime_dict_list
+from utils.time_format_util import object_format_datetime, list_format_datetime, format_datetime_dict_list
 from datetime import datetime, time
 from typing import Union, List
 
@@ -55,11 +55,11 @@ def get_user_by_id(cls, db: Session, user_id: int):
         """
         query_user_basic_info = db.query(SysUser) \
             .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
-            .distinct().all()
+            .distinct().first()
         query_user_dept_info = db.query(SysDept).select_from(SysUser) \
             .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
             .join(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
-            .distinct().all()
+            .distinct().first()
         query_user_role_info = db.query(SysRole).select_from(SysUser) \
             .filter(SysUser.status == 0, SysUser.del_flag == 0, SysUser.user_id == user_id) \
             .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
@@ -85,8 +85,8 @@ def get_user_by_id(cls, db: Session, user_id: int):
                 .order_by(SysMenu.order_num) \
                 .distinct().all()
         results = dict(
-            user_basic_info=list_format_datetime(query_user_basic_info),
-            user_dept_info=list_format_datetime(query_user_dept_info),
+            user_basic_info=object_format_datetime(query_user_basic_info),
+            user_dept_info=object_format_datetime(query_user_dept_info),
             user_role_info=list_format_datetime(query_user_role_info),
             user_post_info=list_format_datetime(query_user_post_info),
             user_menu_info=list_format_datetime(query_user_menu_info)
@@ -104,11 +104,11 @@ def get_user_detail_by_id(cls, db: Session, user_id: int):
         """
         query_user_basic_info = db.query(SysUser) \
             .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
-            .distinct().all()
+            .distinct().first()
         query_user_dept_info = db.query(SysDept).select_from(SysUser) \
             .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
             .join(SysDept, and_(SysUser.dept_id == SysDept.dept_id, SysDept.status == 0, SysDept.del_flag == 0)) \
-            .distinct().all()
+            .distinct().first()
         query_user_role_info = db.query(SysRole).select_from(SysUser) \
             .filter(SysUser.del_flag == 0, SysUser.user_id == user_id) \
             .outerjoin(SysUserRole, SysUser.user_id == SysUserRole.user_id) \
@@ -127,8 +127,8 @@ def get_user_detail_by_id(cls, db: Session, user_id: int):
             .join(SysMenu, and_(SysRoleMenu.menu_id == SysMenu.menu_id, SysMenu.status == 0)) \
             .distinct().all()
         results = dict(
-            user_basic_info=list_format_datetime(query_user_basic_info),
-            user_dept_info=list_format_datetime(query_user_dept_info),
+            user_basic_info=object_format_datetime(query_user_basic_info),
+            user_dept_info=object_format_datetime(query_user_dept_info),
             user_role_info=list_format_datetime(query_user_role_info),
             user_post_info=list_format_datetime(query_user_post_info),
             user_menu_info=list_format_datetime(query_user_menu_info)

dash-fastapi-backend/module_admin/entity/vo/user_vo.py

@@ -128,8 +128,8 @@ class CurrentUserInfo(BaseModel):
     """
     数据库返回当前用户信息
     """
-    user_basic_info: List[Union[UserModel, None]]
-    user_dept_info: List[Union[DeptModel, None]]
+    user_basic_info: Union[UserModel, None]
+    user_dept_info: Union[DeptModel, None]
     user_role_info: List[Union[RoleModel, None]]
     user_post_info: List[Union[PostModel, None]]
     user_menu_info: Union[List, None]

dash-fastapi-backend/module_admin/service/login_service.py

@@ -83,8 +83,8 @@ async def get_current_user(request: Request = Request, token: str = Depends(oaut
         #                                   ex=timedelta(minutes=JwtConfig.REDIS_TOKEN_EXPIRE_MINUTES))
 
         return CurrentUserInfoServiceResponse(
-            user=user.user_basic_info[0],
-            dept=user.user_dept_info[0],
+            user=user.user_basic_info,
+            dept=user.user_dept_info,
             role=user.user_role_info,
             post=user.user_post_info,
             menu=user.user_menu_info

dash-fastapi-backend/module_admin/service/user_service.py

@@ -139,8 +139,8 @@ def detail_user_services(cls, result_db: Session, user_id: int):
         user = UserDao.get_user_detail_by_id(result_db, user_id=user_id)
 
         return UserDetailModel(
-            user=user.user_basic_info[0],
-            dept=user.user_dept_info[0],
+            user=user.user_basic_info,
+            dept=user.user_dept_info,
             role=user.user_role_info,
             post=user.user_post_info
         )
@@ -155,7 +155,7 @@ def reset_user_services(cls, result_db: Session, page_object: ResetUserModel):
         """
         reset_user = page_object.dict(exclude_unset=True)
         if page_object.old_password:
-            user = UserDao.get_user_detail_by_id(result_db, user_id=page_object.user_id).user_basic_info[0]
+            user = UserDao.get_user_detail_by_id(result_db, user_id=page_object.user_id).user_basic_info
             if not PwdUtil.verify_password(page_object.old_password, user.password):
                 result = dict(is_success=False, message='旧密码不正确')
                 return CrudUserResponse(**result)

dash-fastapi-frontend/views/system/user/profile/__init__.py

@@ -65,7 +65,8 @@ def render(button_perms):
                                                     fac.AntdIcon(icon='antd-cluster'),
                                                     fac.AntdText('所属部门'),
                                                     html.Div(
-                                                        session.get('dept_info').get('dept_name') + "/" + ','.join(
+                                                        session.get('dept_info').get('dept_name') if session.get(
+                                                            'dept_info') else "" + "/" + ','.join(
                                                             [item.get('post_name') for item in
                                                              session.get('post_info')]),
                                                         id='profile_c-dept',