feat:完善项目信息
This commit is contained in:
@ -49,18 +49,26 @@ func (c *Instance) tree(src []*model2.SysDepartment, parentID uint64) []*Instanc
|
||||
return out
|
||||
}
|
||||
|
||||
func (c *Instance) Index() ([]*InstanceTreeInfo, error) {
|
||||
func (c *Instance) Index(filterID uint64) ([]*InstanceTreeInfo, error) {
|
||||
mSysDepartment := model.NewSysDepartment()
|
||||
|
||||
out := make([]*model2.SysDepartment, 0)
|
||||
|
||||
if err := model2.Scan(mSysDepartment.SysDepartment, &out, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("tenant_id", c.TenantID),
|
||||
Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)},
|
||||
where := []*model2.ModelWhereOrder{
|
||||
&model2.ModelWhereOrder{
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc)}); err != nil {
|
||||
Where: model2.NewWhere("tenant_id", c.TenantID),
|
||||
Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)},
|
||||
&model2.ModelWhereOrder{
|
||||
Order: model2.NewOrder("id", model2.OrderModeToAsc)},
|
||||
}
|
||||
if filterID > 0 {
|
||||
where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhereCondition("id", "!=", filterID)},
|
||||
&model2.ModelWhereOrder{Where: model2.NewWhereCondition("parent_id", "!=", filterID)})
|
||||
}
|
||||
if err := model2.Scan(mSysDepartment.SysDepartment, &out, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return c.tree(out, 0), nil
|
||||
}
|
||||
|
||||
@ -73,7 +81,7 @@ func (c *Instance) Select() ([]*InstanceTreeInfo, error) {
|
||||
Where: model2.NewWhere("tenant_id", c.TenantID),
|
||||
Order: model2.NewOrder("parent_id", model2.OrderModeToAsc)}, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("status", 1),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc)}); err != nil {
|
||||
Order: model2.NewOrder("id", model2.OrderModeToAsc)}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return c.tree(out, 0), nil
|
||||
|
Reference in New Issue
Block a user