优化

internal/data/department.go

@@ -108,12 +108,6 @@ func (r *departmentRepo) DeleteDepartment(ctx context.Context, id uint) error {
 	if count > 0 {
 		return errors.New("存在子部门,不允许删除")
 	}
-	if err := r.data.gormDB.WithContext(ctx).Model(&userPO{}).Where("dept_id = ?", id).Count(&count).Error; err != nil {
-		return err
-	}
-	if count > 0 {
-		return errors.New("该部门下存在用户,不允许删除")
-	}
 	if err := r.data.gormDB.WithContext(ctx).Model(&userDepartmentPO{}).Where("sys_department_id = ?", id).Count(&count).Error; err != nil {
 		return err
 	}
@@ -135,7 +129,7 @@ func (r *departmentRepo) FindDepartment(ctx context.Context, id uint) (*biz.Depa
 }
 func (r *departmentRepo) ListDepartments(ctx context.Context, name string) ([]*biz.Department, error) {
 	var pos []departmentPO
-	db := r.data.gormDB.WithContext(ctx).Order("sort,id")
+	db := r.data.gormDB.WithContext(ctx).Order("sort")
 	if name != "" {
 		db = db.Where("name LIKE ?", "%"+name+"%")
 	}
@@ -160,7 +154,7 @@ func (r *departmentRepo) ListDepartments(ctx context.Context, name string) ([]*b
 		n := nodes[po.ID]
 		if p := nodes[po.ParentID]; p != nil {
 			p.Children = append(p.Children, n)
-		} else {
+		} else if po.ParentID == 0 {
 			roots = append(roots, n)
 		}
 	}