daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-04 11:59:33 +08:00
parent 0234324e60
commit 288c74dc41
4 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controller/manage/equipment.go
View File

@ -106,6 +106,7 @@ func (c *Equipment) Detail(id uint64) (*EquipmentDetail, error) {
} else if !isExist {
return nil, errors.New("操作错误，数据不存在")
}
out := &EquipmentDetail{
CommonIDString: basic.CommonIDString{ID: mManageEquipment.GetEncodeID()},
ManageEquipment: mManageEquipment.ManageEquipment,
@ -119,6 +120,7 @@ func (c *Equipment) Detail(id uint64) (*EquipmentDetail, error) {
if materials, err = mManageEquipmentMaterial.Materials(id); err != nil {
return nil, err
}
for _, v := range materials {
mManageEquipmentMaterial.ID = v.ID

16
app/controller/manage/supplier.go
View File

@ -43,8 +43,19 @@ func (c *Supplier) List(name, mobile string, kind model2.ManageSupplierKind, pag
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}}
if c.TenantID > 0 {
// 根据单位由下往上查看信息
tenantInfo, err := model.NewSysTenant().Parent(c.TenantID)
if err != nil {
return nil, err
}
tenantIDs := make([]uint64, 0)
for _, v := range tenantInfo {
tenantIDs = append(tenantIDs, v.ID)
}
where = append(where, &model2.ModelWhereOrder{
Where: model2.NewWhereLike("tenant_id", c.TenantID),
Where: model2.NewWhereIn("tenant_id", tenantIDs),
})
}
if name != "" {
@ -67,6 +78,7 @@ func (c *Supplier) List(name, mobile string, kind model2.ManageSupplierKind, pag
if err := model2.Pages(mManageSupplier.ManageSupplier, &out, page, pageSize, &count, where...); err != nil {
return nil, err
}
list := make([]*SupplierInfo, 0)
for _, v := range out {
@ -84,6 +96,8 @@ func (c *Supplier) Select(kind int) ([]*SupplierBasic, error) {
if err := model2.ScanFields(model.NewManageSupplier().ManageSupplier, &out, []string{"id", "name"},
&model2.ModelWhereOrder{
Where: model2.NewWhere("kind", kind),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("tenant_id", c.TenantID),
}); err != nil {
return nil, err
}