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

# Conflicts:
#	pkg/application/web/noticesetting/service/notice_setting.go

@@ -27,11 +27,11 @@ func (noticeSettingService *NoticeSettingService) NoticeSettingList(noticeSettin
 	var orgIds []int
 	var orgIds []int
 	if len(noticeSettingListQuery.OrgName) > 0 {
 	if len(noticeSettingListQuery.OrgName) > 0 {
 		orgResult, err := creationUserGateway.OrgSearch(allied_creation_user.ReqOrgSearch{
 		orgResult, err := creationUserGateway.OrgSearch(allied_creation_user.ReqOrgSearch{
-			Offset:    1,
-			Limit:     20,
-			CompanyId: int(noticeSettingListQuery.Operator.CompanyId),
+			Offset:       1,
+			Limit:        20,
+			CompanyId:    int(noticeSettingListQuery.Operator.CompanyId),
 			IsOrg:     0,
 			IsOrg:     0,
-			DepName:   noticeSettingListQuery.OrgName,
+			MatchOrgName: noticeSettingListQuery.OrgName,
 		})
 		})
 		if err != nil {
 		if err != nil {
 			if err != nil {
 			if err != nil {

@@ -116,6 +116,8 @@ type (
 		Offset    int    `json:"offset"`
 		Offset    int    `json:"offset"`
 		OrgCode   string `json:"orgCode"`
 		OrgCode   string `json:"orgCode"`
 		ParentId  int    `json:"parentId"`
 		ParentId  int    `json:"parentId"`
+		// 模糊匹配组织名称
+		MatchOrgName string `cname:"部门名称" json:"matchOrgName,omitempty"`
 	}
 	}
 
 
 	DataOrgSearch struct {
 	DataOrgSearch struct {