作者 tangxuhui

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

# Conflicts:
#	pkg/application/web/noticesetting/service/notice_setting.go
... ... @@ -31,7 +31,7 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin
Limit: 20,
CompanyId: int(noticeSettingListQuery.Operator.CompanyId),
IsOrg: 0,
DepName: noticeSettingListQuery.OrgName,
MatchOrgName: noticeSettingListQuery.OrgName,
})
if err != nil {
if err != nil {
... ...
... ... @@ -116,6 +116,8 @@ type (
Offset int `json:"offset"`
OrgCode string `json:"orgCode"`
ParentId int `json:"parentId"`
// 模糊匹配组织名称
MatchOrgName string `cname:"部门名称" json:"matchOrgName,omitempty"`
}
DataOrgSearch struct {
... ...