From 41dbe7b52a7defa7d26223499e078033e7175793 Mon Sep 17 00:00:00 2001
From: kylinhao <wanghao6@kylinos.cn>
Date: Tue, 12 Apr 2022 09:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9C=BA=E5=99=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/app/server/controller/machinemanager.go | 28 ++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkg/app/server/controller/machinemanager.go b/pkg/app/server/controller/machinemanager.go
index 3798b651..2e1991fc 100644
--- a/pkg/app/server/controller/machinemanager.go
+++ b/pkg/app/server/controller/machinemanager.go
@@ -247,23 +247,33 @@ func Deletedepartdata(c *gin.Context) {
 }
 
 type Depart struct {
-	Page       int  `form:"page"`
-	Size       int  `form:"size"`
-	ID         int  `form:"DepartId"`
-	ShowSelect bool `form:"ShowSelect"`
+	Page int `form:"page"`
+	Size int `form:"size"`
+	ID   int `form:"DepartId"`
 }
 
 func MachineInfo(c *gin.Context) {
-	depart := &Depart{}
-	if c.ShouldBind(depart) != nil {
+	j, err := ioutil.ReadAll(c.Request.Body)
+	if err != nil {
 		response.Response(c, http.StatusUnprocessableEntity,
 			422,
 			nil,
-			"parameter error")
+			err.Error())
 		return
 	}
-
-	a := ReturnID(depart.ID)
+	var depart Depart
+	err = json.Unmarshal(j, &depart)
+	logger.Info("%+v", depart)
+	if err != nil {
+		response.Response(c, http.StatusUnprocessableEntity,
+			422,
+			nil,
+			err.Error())
+		return
+	}
+	var a []int
+	ReturnSpecifiedDepart(depart.ID, &a)
+	logger.Info("%+v", a)
 	a = append(a, depart.ID)
 	machinelist := make([]model.Res, 0)
 	for _, value := range a {
-- 
Gitee