正在显示
1 个修改的文件
包含
4 行增加
和
1 行删除
| @@ -24,6 +24,8 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | @@ -24,6 +24,8 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | ||
| 24 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( | 24 | creationUserGateway := allied_creation_user.NewHttplibAlliedCreationUser( |
| 25 | noticeSettingListQuery.Operator, | 25 | noticeSettingListQuery.Operator, |
| 26 | ) | 26 | ) |
| 27 | + var orgIds []int | ||
| 28 | + if len(noticeSettingListQuery.OrgName) > 0 { | ||
| 27 | orgResult, err := creationUserGateway.OrgSearch(allied_creation_user.ReqOrgSearch{ | 29 | orgResult, err := creationUserGateway.OrgSearch(allied_creation_user.ReqOrgSearch{ |
| 28 | Offset: 1, | 30 | Offset: 1, |
| 29 | Limit: 20, | 31 | Limit: 20, |
| @@ -39,10 +41,11 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | @@ -39,10 +41,11 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin | ||
| 39 | if len(orgResult.Orgs) == 0 { | 41 | if len(orgResult.Orgs) == 0 { |
| 40 | return 0, []dto.NoticeSettingItem{}, nil | 42 | return 0, []dto.NoticeSettingItem{}, nil |
| 41 | } | 43 | } |
| 42 | - var orgIds []int | ||
| 43 | for _, v := range orgResult.Orgs { | 44 | for _, v := range orgResult.Orgs { |
| 44 | orgIds = append(orgIds, v.OrgID) | 45 | orgIds = append(orgIds, v.OrgID) |
| 45 | } | 46 | } |
| 47 | + } | ||
| 48 | + | ||
| 46 | result, err := creationBasicGateway.NoticeSettingSearch(allied_creation_basic.ReqNoticeSettingSearch{ | 49 | result, err := creationBasicGateway.NoticeSettingSearch(allied_creation_basic.ReqNoticeSettingSearch{ |
| 47 | PageIndex: noticeSettingListQuery.PageNumber, | 50 | PageIndex: noticeSettingListQuery.PageNumber, |
| 48 | PageSize: noticeSettingListQuery.PageSize, | 51 | PageSize: noticeSettingListQuery.PageSize, |
-
请 注册 或 登录 后发表评论