...
|
...
|
@@ -24,6 +24,8 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin |
|
|
creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser(
|
|
|
noticeSettingListQuery.Operator,
|
|
|
)
|
|
|
var orgIds []int
|
|
|
if len(noticeSettingListQuery.OrgName) > 0 {
|
|
|
orgResult, err := creationUserGateway.OrgSearch(allied_creation_user.ReqOrgSearch{
|
|
|
Offset: 1,
|
|
|
Limit: 20,
|
...
|
...
|
@@ -39,10 +41,11 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin |
|
|
if len(orgResult.Orgs) == 0 {
|
|
|
return 0, []dto.NoticeSettingItem{}, nil
|
|
|
}
|
|
|
var orgIds []int
|
|
|
for _, v := range orgResult.Orgs {
|
|
|
orgIds = append(orgIds, v.OrgID)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
result, err := creationBasicGateway.NoticeSettingSearch(allied_creation_basic.ReqNoticeSettingSearch{
|
|
|
PageIndex: noticeSettingListQuery.PageNumber,
|
|
|
PageSize: noticeSettingListQuery.PageSize,
|
...
|
...
|
|