Browse Source

perf: 优化部分ids字符串分割写法

master
insistence 7 months ago
parent
commit
2263897111
  1. 2
      ruoyi-fastapi-backend/module_admin/controller/dept_controller.py
  2. 2
      ruoyi-fastapi-backend/module_admin/controller/role_controller.py
  3. 2
      ruoyi-fastapi-backend/module_admin/controller/user_controller.py
  4. 2
      ruoyi-fastapi-backend/module_admin/service/config_service.py
  5. 2
      ruoyi-fastapi-backend/module_admin/service/dept_service.py
  6. 4
      ruoyi-fastapi-backend/module_admin/service/dict_service.py
  7. 2
      ruoyi-fastapi-backend/module_admin/service/job_log_service.py
  8. 2
      ruoyi-fastapi-backend/module_admin/service/job_service.py
  9. 4
      ruoyi-fastapi-backend/module_admin/service/log_service.py
  10. 2
      ruoyi-fastapi-backend/module_admin/service/menu_service.py
  11. 2
      ruoyi-fastapi-backend/module_admin/service/notice_service.py
  12. 2
      ruoyi-fastapi-backend/module_admin/service/online_service.py
  13. 2
      ruoyi-fastapi-backend/module_admin/service/post_service.py
  14. 6
      ruoyi-fastapi-backend/module_admin/service/role_service.py
  15. 2
      ruoyi-fastapi-backend/module_admin/service/user_service.py

2
ruoyi-fastapi-backend/module_admin/controller/dept_controller.py

@ -100,7 +100,7 @@ async def delete_system_dept(
current_user: CurrentUserModel = Depends(LoginService.get_current_user),
data_scope_sql: str = Depends(GetDataScope('SysDept')),
):
dept_id_list = dept_ids.split(',')
dept_id_list = dept_ids.split(',') if dept_ids else []
if dept_id_list:
for dept_id in dept_id_list:
if not current_user.user.admin:

2
ruoyi-fastapi-backend/module_admin/controller/role_controller.py

@ -130,7 +130,7 @@ async def delete_system_role(
current_user: CurrentUserModel = Depends(LoginService.get_current_user),
data_scope_sql: str = Depends(GetDataScope('SysDept')),
):
role_id_list = role_ids.split(',')
role_id_list = role_ids.split(',') if role_ids else []
if role_id_list:
for role_id in role_id_list:
await RoleService.check_role_allowed_services(RoleModel(roleId=int(role_id)))

2
ruoyi-fastapi-backend/module_admin/controller/user_controller.py

@ -133,7 +133,7 @@ async def delete_system_user(
current_user: CurrentUserModel = Depends(LoginService.get_current_user),
data_scope_sql: str = Depends(GetDataScope('SysUser')),
):
user_id_list = user_ids.split(',')
user_id_list = user_ids.split(',') if user_ids else []
if user_id_list:
if current_user.user.user_id in user_id_list:
logger.warning('当前登录用户不能删除')

2
ruoyi-fastapi-backend/module_admin/service/config_service.py

@ -147,7 +147,7 @@ class ConfigService:
:param page_object: 删除参数配置对象
:return: 删除参数配置校验结果
"""
if page_object.config_ids.split(','):
if page_object.config_ids:
config_id_list = page_object.config_ids.split(',')
try:
delete_config_key_list = []

2
ruoyi-fastapi-backend/module_admin/service/dept_service.py

@ -162,7 +162,7 @@ class DeptService:
:param page_object: 删除部门对象
:return: 删除部门校验结果
"""
if page_object.dept_ids.split(','):
if page_object.dept_ids:
dept_id_list = page_object.dept_ids.split(',')
try:
for dept_id in dept_id_list:

4
ruoyi-fastapi-backend/module_admin/service/dict_service.py

@ -136,7 +136,7 @@ class DictTypeService:
:param page_object: 删除字典类型对象
:return: 删除字典类型校验结果
"""
if page_object.dict_ids.split(','):
if page_object.dict_ids:
dict_id_list = page_object.dict_ids.split(',')
try:
delete_dict_type_list = []
@ -385,7 +385,7 @@ class DictDataService:
:param page_object: 删除字典数据对象
:return: 删除字典数据校验结果
"""
if page_object.dict_codes.split(','):
if page_object.dict_codes:
dict_code_list = page_object.dict_codes.split(',')
try:
delete_dict_type_list = []

2
ruoyi-fastapi-backend/module_admin/service/job_log_service.py

@ -58,7 +58,7 @@ class JobLogService:
:param page_object: 删除定时任务日志对象
:return: 删除定时任务日志校验结果
"""
if page_object.job_log_ids.split(','):
if page_object.job_log_ids:
job_log_id_list = page_object.job_log_ids.split(',')
try:
for job_log_id in job_log_id_list:

2
ruoyi-fastapi-backend/module_admin/service/job_service.py

@ -171,7 +171,7 @@ class JobService:
:param page_object: 删除定时任务对象
:return: 删除定时任务校验结果
"""
if page_object.job_ids.split(','):
if page_object.job_ids:
job_id_list = page_object.job_ids.split(',')
try:
for job_id in job_id_list:

4
ruoyi-fastapi-backend/module_admin/service/log_service.py

@ -64,7 +64,7 @@ class OperationLogService:
:param page_object: 删除操作日志对象
:return: 删除操作日志校验结果
"""
if page_object.oper_ids.split(','):
if page_object.oper_ids:
oper_id_list = page_object.oper_ids.split(',')
try:
for oper_id in oper_id_list:
@ -194,7 +194,7 @@ class LoginLogService:
:param page_object: 删除操作日志对象
:return: 删除操作日志校验结果
"""
if page_object.info_ids.split(','):
if page_object.info_ids:
info_id_list = page_object.info_ids.split(',')
try:
for info_id in info_id_list:

2
ruoyi-fastapi-backend/module_admin/service/menu_service.py

@ -149,7 +149,7 @@ class MenuService:
:param page_object: 删除菜单对象
:return: 删除菜单校验结果
"""
if page_object.menu_ids.split(','):
if page_object.menu_ids:
menu_id_list = page_object.menu_ids.split(',')
try:
for menu_id in menu_id_list:

2
ruoyi-fastapi-backend/module_admin/service/notice_service.py

@ -97,7 +97,7 @@ class NoticeService:
:param page_object: 删除通知公告对象
:return: 删除通知公告校验结果
"""
if page_object.notice_ids.split(','):
if page_object.notice_ids:
notice_id_list = page_object.notice_ids.split(',')
try:
for notice_id in notice_id_list:

2
ruoyi-fastapi-backend/module_admin/service/online_service.py

@ -66,7 +66,7 @@ class OnlineService:
:param page_object: 强退在线用户对象
:return: 强退在线用户校验结果
"""
if page_object.token_ids.split(','):
if page_object.token_ids:
token_id_list = page_object.token_ids.split(',')
for token_id in token_id_list:
await request.app.state.redis.delete(f"{RedisInitKeyConfig.ACCESS_TOKEN.get('key')}:{token_id}")

2
ruoyi-fastapi-backend/module_admin/service/post_service.py

@ -117,7 +117,7 @@ class PostService:
:param page_object: 删除岗位对象
:return: 删除岗位校验结果
"""
if page_object.post_ids.split(','):
if page_object.post_ids:
post_id_list = page_object.post_ids.split(',')
try:
for post_id in post_id_list:

6
ruoyi-fastapi-backend/module_admin/service/role_service.py

@ -92,14 +92,14 @@ class RoleService:
:param data_scope_sql: 数据权限对应的查询sql语句
:return: 校验结果
"""
role_id_list = role_ids.split(',')
role_id_list = role_ids.split(',') if role_ids else []
if role_id_list:
for role_id in role_id_list:
roles = await RoleDao.get_role_list(
query_db, RolePageQueryModel(roleId=int(role_id)), data_scope_sql, is_page=False
)
if roles:
return CrudResponseModel(is_success=True, message='校验通过')
continue
else:
raise ServiceException(message='没有权限访问角色数据')
@ -235,7 +235,7 @@ class RoleService:
:param page_object: 删除角色对象
:return: 删除角色校验结果
"""
if page_object.role_ids.split(','):
if page_object.role_ids:
role_id_list = page_object.role_ids.split(',')
try:
for role_id in role_id_list:

2
ruoyi-fastapi-backend/module_admin/service/user_service.py

@ -232,7 +232,7 @@ class UserService:
:param page_object: 删除用户对象
:return: 删除用户校验结果
"""
if page_object.user_ids.split(','):
if page_object.user_ids:
user_id_list = page_object.user_ids.split(',')
try:
for user_id in user_id_list:

Loading…
Cancel
Save