数据结构调整

@@ -9,4 +9,5 @@ type NoticeSettingItem struct {
 	ModuleActionName string `json:"moduleActionName"`
 	ModuleActionName string `json:"moduleActionName"`
 	NoticeSettingID  int    `json:"noticeSettingId,string"`
 	NoticeSettingID  int    `json:"noticeSettingId,string"`
 	OrgID            int    `json:"orgId,string"`
 	OrgID            int    `json:"orgId,string"`
+	OrgName          string `json:"orgName"`
 }
 }

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