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

@@ -5,4 +5,5 @@ import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domai
 type SettingListQuery struct {
 	//操作人
 	Operator domain.Operator `json:"-"`
+	Key      string          `json:"key"`
 }

@@ -19,7 +19,9 @@ func (srv SystemSettingService) GetSystemSettingList(systemSettingListQuery *que
 	creationBasicGateway := allied_creation_basic.NewHttplibAlliedCreationBasic(
 		systemSettingListQuery.Operator,
 	)
-	result, err := creationBasicGateway.SystemSettingSearch(allied_creation_basic.ReqSystemSettingSearch{})
+	result, err := creationBasicGateway.SystemSettingSearch(allied_creation_basic.ReqSystemSettingSearch{
+		SettingName: systemSettingListQuery.Key,
+	})
 	return result, err
 }
 

@@ -34,6 +34,7 @@ type (
 //获取企业的系统设置列表
 type (
 	ReqSystemSettingSearch struct {
+		SettingName string `json:"settingName"` //配置名称搜索
 	}
 
 	DataSystemSettingSearch struct {

@@ -13,9 +13,12 @@ type SystemSettingController struct {
 
 func (controller SystemSettingController) SystemSettingSearch() {
 	systemSettingService := service.NewSystemSettingService(nil)
-	settingListQuery := &query.SettingListQuery{
-		Operator: controller.GetOperator(),
+	settingListQuery := &query.SettingListQuery{}
+	err := controller.Unmarshal(settingListQuery)
+	if err != nil {
+		log.Logger.Debug("json err:" + err.Error())
 	}
+	settingListQuery.Operator = controller.GetOperator()
 	data, err := systemSettingService.GetSystemSettingList(settingListQuery)
 	controller.Response(data, err)
 }