feat: 部门管理和菜单管理service层引入ServiceWarning

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

@@ -1,7 +1,7 @@
 from module_admin.dao.dept_dao import *
 from module_admin.entity.vo.common_vo import CrudResponseModel
 from config.constant import CommonConstant
-from exceptions.exception import ServiceException
+from exceptions.exception import ServiceException, ServiceWarning
 from utils.common_util import CamelCaseUtil
 
 
@@ -147,9 +147,9 @@ class DeptService:
             try:
                 for dept_id in dept_id_list:
                     if (await DeptDao.count_children_dept_dao(query_db, int(dept_id))) > 0:
-                        raise ServiceException(message='存在下级部门,不允许删除')
+                        raise ServiceWarning(message='存在下级部门,不允许删除')
                     elif (await DeptDao.count_dept_user_dao(query_db, int(dept_id))) > 0:
-                        raise ServiceException(message='部门存在用户,不允许删除')
+                        raise ServiceWarning(message='部门存在用户,不允许删除')
 
                     await DeptDao.delete_dept_dao(query_db, DeptModel(deptId=dept_id))
                 await query_db.commit()

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

@@ -4,7 +4,7 @@ from module_admin.entity.vo.common_vo import CrudResponseModel
 from module_admin.dao.role_dao import RoleDao
 from module_admin.dao.menu_dao import *
 from config.constant import CommonConstant, MenuConstant
-from exceptions.exception import ServiceException
+from exceptions.exception import ServiceException, ServiceWarning
 from utils.common_util import CamelCaseUtil
 from utils.string_util import StringUtil
 
@@ -137,9 +137,9 @@ class MenuService:
             try:
                 for menu_id in menu_id_list:
                     if (await MenuDao.has_child_by_menu_id_dao(query_db, int(menu_id))) > 0:
-                        raise ServiceException(message='存在子菜单,不允许删除')
+                        raise ServiceWarning(message='存在子菜单,不允许删除')
                     elif (await MenuDao.check_menu_exist_role_dao(query_db, int(menu_id))) > 0:
-                        raise ServiceException(message='菜单已分配,不允许删除')
+                        raise ServiceWarning(message='菜单已分配,不允许删除')
                     await MenuDao.delete_menu_dao(query_db, MenuModel(menuId=menu_id))
                 await query_db.commit()
                 return CrudResponseModel(is_success=True, message='删除成功')