更新结构

@@ -2,6 +2,7 @@ package service
 
 
 import (
 import (
 	"fmt"
 	"fmt"
+	"log"
 	"time"
 	"time"
 
 
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
@@ -130,9 +131,11 @@ func (noticeSettingService *NoticeSettingService) UpdateNoticeSetting(updateNoti
 		"orgId":        updateNoticeSettingCommand.OrgId,
 		"orgId":        updateNoticeSettingCommand.OrgId,
 		"moduleAction": updateNoticeSettingCommand.ModuleAction,
 		"moduleAction": updateNoticeSettingCommand.ModuleAction,
 	})
 	})
+	log.Println("+++++======>", updateNoticeSettingCommand)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
+
 	if len(noticeSettings) > 1 {
 	if len(noticeSettings) > 1 {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "配置信息重复")
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "配置信息重复")
 	}
 	}
@@ -140,7 +143,7 @@ func (noticeSettingService *NoticeSettingService) UpdateNoticeSetting(updateNoti
 		//存在旧的数据
 		//存在旧的数据
 		noticeSetting = noticeSettings[0]
 		noticeSetting = noticeSettings[0]
 		if noticeSetting.NoticeSettingId != updateNoticeSettingCommand.NoticeSettingId {
 		if noticeSetting.NoticeSettingId != updateNoticeSettingCommand.NoticeSettingId {
-			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "配置信息已存在")
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "该环节配置已存在")
 		}
 		}
 	}
 	}
 	noticeSetting, err = noticeSettingRepository.FindOne(map[string]interface{}{
 	noticeSetting, err = noticeSettingRepository.FindOne(map[string]interface{}{
@@ -152,8 +155,6 @@ func (noticeSettingService *NoticeSettingService) UpdateNoticeSetting(updateNoti
 	err = noticeSetting.Update(map[string]interface{}{
 	err = noticeSetting.Update(map[string]interface{}{
 		"content":   updateNoticeSettingCommand.Content,
 		"content":   updateNoticeSettingCommand.Content,
 		"isPush":    updateNoticeSettingCommand.IsPush,
 		"isPush":    updateNoticeSettingCommand.IsPush,
-		"module":       updateNoticeSettingCommand.Module,
-		"moduleAction": updateNoticeSettingCommand.ModuleAction,
 		"updatedAt": time.Now(),
 		"updatedAt": time.Now(),
 	})
 	})
 	if err != nil {
 	if err != nil {

@@ -144,6 +144,7 @@ func (systemSettingService *SystemSettingService) UpdateSystemSetting(updateSyst
 	}
 	}
 	var systemSetting *domain.SystemSetting
 	var systemSetting *domain.SystemSetting
 	if len(systemSettings) == 0 {
 	if len(systemSettings) == 0 {
+		//未找到历史数据，使用默认配置
 		defaultSet := new(domain.SystemSetting).GetDefaultSetting(updateSystemSettingCommand.SettingCode)
 		defaultSet := new(domain.SystemSetting).GetDefaultSetting(updateSystemSettingCommand.SettingCode)
 		if len(defaultSet) > 0 {
 		if len(defaultSet) > 0 {
 			systemSetting = &defaultSet[0]
 			systemSetting = &defaultSet[0]