...
|
...
|
@@ -57,7 +57,9 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin |
|
|
return 0, nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
|
|
|
}
|
|
|
dataList := []dto.NoticeSettingItem{}
|
|
|
|
|
|
for _, v := range result.List {
|
|
|
|
|
|
item := dto.NoticeSettingItem{
|
|
|
CompanyID: v.CompanyID,
|
|
|
Content: v.Content,
|
...
|
...
|
@@ -66,9 +68,17 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin |
|
|
ModuleAction: v.ModuleAction,
|
|
|
NoticeSettingID: v.NoticeSettingID,
|
|
|
OrgID: v.OrgID,
|
|
|
ModuleActionName: v.ModuleActionName,
|
|
|
}
|
|
|
orgData, _ := creationUserGateway.OrgGet(allied_creation_user.ReqOrgGet{
|
|
|
OrgId: v.OrgID,
|
|
|
})
|
|
|
if orgData != nil {
|
|
|
item.OrgName = orgData.OrgName
|
|
|
}
|
|
|
dataList = append(dataList, item)
|
|
|
}
|
|
|
|
|
|
return result.Count, dataList, nil
|
|
|
}
|
|
|
|
...
|
...
|
|