调整搜索条件

-{"D:\\workspaceGo\\src\\allied-creation-basic\\pkg\\port\\beego":1629701389888857200}
+{"D:\\workspaceGo\\src\\allied-creation-basic\\pkg\\port\\beego":1630467905783651600}

 package service
 package service
 
 
 import (
 import (
+	"fmt"
+
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-basic/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-basic/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-basic/pkg/application/systemSetting/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-basic/pkg/application/systemSetting/command"
@@ -87,9 +89,6 @@ func (systemSettingService *SystemSettingService) ListSystemSetting(listSystemSe
 	queryOption := map[string]interface{}{
 	queryOption := map[string]interface{}{
 		"companyId": listSystemSettingQuery.CompanyId,
 		"companyId": listSystemSettingQuery.CompanyId,
 	}
 	}
-	if len(listSystemSettingQuery.SettingCode) > 0 {
-		queryOption["settingCode"] = listSystemSettingQuery.SettingCode
-	}
 	_, systemSettings, err := systemSettingRepository.Find(queryOption)
 	_, systemSettings, err := systemSettingRepository.Find(queryOption)
 	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())
@@ -102,7 +101,8 @@ func (systemSettingService *SystemSettingService) ListSystemSetting(listSystemSe
 		code := systemSettings[i].SettingCode
 		code := systemSettings[i].SettingCode
 		settingMap[code] = systemSettings[i]
 		settingMap[code] = systemSettings[i]
 	}
 	}
-	defaultSettings := new(domain.SystemSetting).GetDefaultSetting("", listSystemSettingQuery.SettingName)
+	fmt.Println(listSystemSettingQuery.SettingCode, listSystemSettingQuery.SettingName)
+	defaultSettings := new(domain.SystemSetting).GetDefaultSetting(listSystemSettingQuery.SettingCode, listSystemSettingQuery.SettingName)
 	for i := range defaultSettings {
 	for i := range defaultSettings {
 		if v, ok := settingMap[defaultSettings[i].SettingCode]; ok {
 		if v, ok := settingMap[defaultSettings[i].SettingCode]; ok {
 			defaultSettings[i].Value = v.Value
 			defaultSettings[i].Value = v.Value

@@ -76,7 +76,7 @@ var defaultsysSettingList = []SystemSetting{
 }
 }
 
 
 func (systemSetting *SystemSetting) GetDefaultSetting(settingCode string, settingName string) []SystemSetting {
 func (systemSetting *SystemSetting) GetDefaultSetting(settingCode string, settingName string) []SystemSetting {
-	var list []SystemSetting
+	list := []SystemSetting{}
 	for i := range defaultsysSettingList {
 	for i := range defaultsysSettingList {
 		settingCodeOk := true
 		settingCodeOk := true
 		settingNameOk := true
 		settingNameOk := true

@@ -38,6 +38,10 @@ func (controller *SystemSettingController) GetSystemSetting() {
 func (controller *SystemSettingController) ListSystemSetting() {
 func (controller *SystemSettingController) ListSystemSetting() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	listSystemSettingQuery := &query.ListSystemSettingQuery{}
 	listSystemSettingQuery := &query.ListSystemSettingQuery{}
+	err := controller.Unmarshal(listSystemSettingQuery)
+	if err != nil {
+		log.Logger.Debug(err.Error())
+	}
 	listSystemSettingQuery.CompanyId = controller.GetCompanyId()
 	listSystemSettingQuery.CompanyId = controller.GetCompanyId()
 	data, err := systemSettingService.ListSystemSetting(listSystemSettingQuery)
 	data, err := systemSettingService.ListSystemSetting(listSystemSettingQuery)
 	controller.Response(data, err)
 	controller.Response(data, err)