1

api/dao/adminDept.go

@@ -35,6 +35,14 @@ func (r *AdminDeptDao) GetAdminDeptByParentId(parentId int64) (m *model.AdminDep
 	return m, nil
 }
 
+func (r *AdminDeptDao) GetAdminDeptListByParentId(parentId int64) (m []*model.AdminDept, err error) {
+	err = global.Db.Where("parent_id = ?", parentId).Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // AddAdminDept 新增部门
 func (r *AdminDeptDao) AddAdminDept(tx *gorm.DB, model *model.AdminDept) (*model.AdminDept, error) {
 	if err := tx.Create(model).Error; err != nil {

api/dao/adminMenu.go

@@ -27,6 +27,15 @@ func (r *AdminMenuDao) GetAdminMenuListSortOrderNum() (m []*model.AdminMenu, err
 	return m, nil
 }
 
+// GetAdminMenuListByParentId 获取菜单数据-菜单id
+func (r *AdminMenuDao) GetAdminMenuListByParentId(parentId int64) (m []*model.AdminMenu, err error) {
+	err = global.Db.Where("parent_id = ?", parentId).Find(&m).Error
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // GetAdminMenuById 获取菜单数据-菜单id
 func (r *AdminMenuDao) GetAdminMenuById(menuId int64) (m *model.AdminMenu, err error) {
 	err = global.Db.First(&m, menuId).Error

api/service/dept.go

@@ -127,8 +127,8 @@ func (r *DeptService) DeleteDept(deleteDeptRequest requests.DeleteDept) (bool, e
 		}
 
 		// 检测部门是否存在子集
-		childrenAdminDept, err := adminDeptDao.GetAdminDeptByParentId(v)
-		if err != nil || childrenAdminDept != nil {
+		childrenAdminDepts, err := adminDeptDao.GetAdminDeptListByParentId(v)
+		if err != nil || len(childrenAdminDepts) > 0 {
 			tx.Rollback()
 			return false, errors.New("存在下级部门，删除失败")
 		}

api/service/menu.go

@@ -281,8 +281,8 @@ func (r *MenuService) DeleteMenu(c *gin.Context, DeleteMenuRequest requests.Dele
 		}
 
 		// 检测菜单是否存在子级
-		childrenAdminMenu, err := adminMenuDao.GetAdminMenuByParentId(v)
-		if err != nil || childrenAdminMenu != nil {
+		childrenAdminMenus, err := adminMenuDao.GetAdminMenuListByParentId(v)
+		if err != nil || len(childrenAdminMenus) > 0 {
 			tx.Rollback()
 			return false, errors.New("存在下级菜单，删除失败")
 		}