From cea214030931052437966d6f25b1b59bae3bd358 Mon Sep 17 00:00:00 2001 From: ningyu Date: Wed, 15 May 2019 15:12:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E8=BF=87JSON=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E4=BC=A0=E9=80=92RPC=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/climc/shell/itsm_histroic_process_instance.go | 5 ++++- .../modules/mod_itsm_historic_process_instances.go | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/climc/shell/itsm_histroic_process_instance.go b/cmd/climc/shell/itsm_histroic_process_instance.go index ab4746d7db..5c7a54afb7 100644 --- a/cmd/climc/shell/itsm_histroic_process_instance.go +++ b/cmd/climc/shell/itsm_histroic_process_instance.go @@ -69,7 +69,10 @@ func init() { ID string `help:"ID of user"` } R(&HistoricProcessInstanceStaticticsOptions{}, "historic-process-instance-statistics", "Delete all contacts for the user", func(s *mcclient.ClientSession, args *HistoricProcessInstanceStaticticsOptions) error { - rst, err := modules.HistoricProcessInstance.DoGetStatistics(s, args.ID) + params := jsonutils.NewDict() + params.Add(jsonutils.NewString(args.ID), "user_id") + + rst, err := modules.HistoricProcessInstance.DoGetStatistics(s, params) if err != nil { return err diff --git a/pkg/mcclient/modules/mod_itsm_historic_process_instances.go b/pkg/mcclient/modules/mod_itsm_historic_process_instances.go index a5662a6347..3630d8d92e 100644 --- a/pkg/mcclient/modules/mod_itsm_historic_process_instances.go +++ b/pkg/mcclient/modules/mod_itsm_historic_process_instances.go @@ -26,9 +26,11 @@ type HiProcInstManager struct { ResourceManager } -func (this *HiProcInstManager) DoGetStatistics(s *mcclient.ClientSession, user_id string) (jsonutils.JSONObject, error) { - hiProcInstPath := fmt.Sprintf("/historic-process-instances?status=unfinished&user_id=%s", user_id) - procTaskPath := fmt.Sprintf("/process-tasks?user_id=%s", user_id) +func (this *HiProcInstManager) DoGetStatistics(s *mcclient.ClientSession, params jsonutils.JSONObject) (jsonutils.JSONObject, error) { + userId, _ := params.GetString("user_id") + + hiProcInstPath := fmt.Sprintf("/historic-process-instances?status=unfinished&user_id=%s", userId) + procTaskPath := fmt.Sprintf("/process-tasks?user_id=%s", userId) hiProcInstObj, _ := this._list(s, hiProcInstPath, "historic-process-instances") procTaskObj, _ := this._list(s, procTaskPath, "process-tasks")