Rename the join query functions

Author: wu-clan

backend/app/admin/crud/crud_dept.py

@@ -99,7 +99,7 @@ async def delete(self, db: AsyncSession, dept_id: int) -> int:
         """
         return await self.delete_model_by_column(db, id=dept_id, logical_deletion=True, deleted_flag_column='del_flag')
 
-    async def get_with_relation(self, db: AsyncSession, dept_id: int) -> Any | None:
+    async def get_join(self, db: AsyncSession, dept_id: int) -> Any | None:
         """
         获取部门及关联数据
 

backend/app/admin/crud/crud_user.py

@@ -282,7 +282,7 @@ async def set_multi_login(self, db: AsyncSession, user_id: int, *, multi_login:
         """
         return await self.update_model(db, user_id, {'is_multi_login': multi_login})
 
-    async def get_joins(
+    async def get_join(
         self,
         db: AsyncSession,
         *,

backend/app/admin/service/dept_service.py

@@ -107,7 +107,7 @@ async def delete(*, db: AsyncSession, pk: int) -> int:
         :param pk: 部门 ID
         :return:
         """
-        dept = await dept_dao.get_with_relation(db, pk)
+        dept = await dept_dao.get_join(db, pk)
         if not dept:
             raise errors.NotFoundError(msg='部门不存在')
         if dept.users:

backend/app/admin/service/user_service.py

@@ -37,7 +37,7 @@ async def get_userinfo(*, db: AsyncSession, pk: int | None = None, username: str
         :param username: 用户名
         :return:
         """
-        user = await user_dao.get_joins(db, user_id=pk, username=username)
+        user = await user_dao.get_join(db, user_id=pk, username=username)
         if not user:
             raise errors.NotFoundError(msg='用户不存在')
         return user
@@ -51,7 +51,7 @@ async def get_roles(*, db: AsyncSession, pk: int) -> Sequence[Role]:
         :param pk: 用户 ID
         :return:
         """
-        user = await user_dao.get_joins(db, user_id=pk)
+        user = await user_dao.get_join(db, user_id=pk)
         if not user:
             raise errors.NotFoundError(msg='用户不存在')
         return user.roles
@@ -101,7 +101,7 @@ async def update(*, db: AsyncSession, pk: int, obj: UpdateUserParam) -> int:
         :param obj: 用户更新参数
         :return:
         """
-        user = await user_dao.get_joins(db, user_id=pk)
+        user = await user_dao.get_join(db, user_id=pk)
         if not user:
             raise errors.NotFoundError(msg='用户不存在')
         if obj.username != user.username and await user_dao.get_by_username(db, obj.username):

backend/common/security/jwt.py

@@ -245,7 +245,7 @@ async def get_current_user(db: AsyncSession, pk: int) -> User:
     """
     from backend.app.admin.crud.crud_user import user_dao
 
-    user = await user_dao.get_joins(db, user_id=pk)
+    user = await user_dao.get_join(db, user_id=pk)
     if not user:
         raise errors.TokenError(msg='Token 无效')
     if not user.status: