逻辑调整

@@ -128,6 +128,7 @@ func (noticeSettingService *NoticeSettingService) UpdateNoticeSetting(updateNoti
 	} else {
 	} else {
 		noticeSettingRepository = value
 		noticeSettingRepository = value
 	}
 	}
+
 	var (
 	var (
 		noticeSettings []*domain.NoticeSetting
 		noticeSettings []*domain.NoticeSetting
 		noticeSetting  *domain.NoticeSetting
 		noticeSetting  *domain.NoticeSetting
@@ -158,10 +159,22 @@ func (noticeSettingService *NoticeSettingService) UpdateNoticeSetting(updateNoti
 	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())
 	}
 	}
+	moduleAction, err := domain.GetNoticeModuleAction(updateNoticeSettingCommand.Module, updateNoticeSettingCommand.ModuleAction)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	module, err := domain.GetNoticeModule(updateNoticeSettingCommand.Module)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
 	err = noticeSetting.Update(map[string]interface{}{
 	err = noticeSetting.Update(map[string]interface{}{
-		"content":   updateNoticeSettingCommand.Content,
-		"isPush":    updateNoticeSettingCommand.IsPush,
-		"updatedAt": time.Now(),
+		"module":           module.ModuleCode,
+		"moduleName":       module.ModuleName,
+		"moduleAction":     moduleAction.ActionCode,
+		"moduleActionName": moduleAction.ActionName,
+		"content":          updateNoticeSettingCommand.Content,
+		"isPush":           updateNoticeSettingCommand.IsPush,
+		"updatedAt":        time.Now(),
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())

@@ -63,9 +63,15 @@ func (noticeSetting *NoticeSetting) Update(data map[string]interface{}) error {
 	if module, ok := data["module"]; ok {
 	if module, ok := data["module"]; ok {
 		noticeSetting.Module = module.(string)
 		noticeSetting.Module = module.(string)
 	}
 	}
+	if moduleName, ok := data["moduleName"]; ok {
+		noticeSetting.ModuleName = moduleName.(string)
+	}
 	if moduleAction, ok := data["moduleAction"]; ok {
 	if moduleAction, ok := data["moduleAction"]; ok {
 		noticeSetting.ModuleAction = moduleAction.(string)
 		noticeSetting.ModuleAction = moduleAction.(string)
 	}
 	}
+	if moduleActionName, ok := data["moduleActionName"]; ok {
+		noticeSetting.ModuleActionName = moduleActionName.(string)
+	}
 	if noticeSettingId, ok := data["noticeSettingId"]; ok {
 	if noticeSettingId, ok := data["noticeSettingId"]; ok {
 		noticeSetting.NoticeSettingId = noticeSettingId.(int64)
 		noticeSetting.NoticeSettingId = noticeSettingId.(int64)
 	}
 	}