From 19b9edee628bc94e31bda473551ea26dc0063993 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Mon, 6 Sep 2021 10:36:45 +0800
Subject: [PATCH] UPDATE

---
 dsSzxy/.idea/workspace.xml                                   | 5 -----
 .../ImRelate/ImRelateController/ImRelateController.go        | 3 ++-
 dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go          | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index fe3aafeb..ade1e72e 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -5,11 +5,6 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Config/Config.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/Config.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/ConfigUtil/ConfigUtil.go" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ConfigUtil/ConfigUtil.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
index abd3f7a8..d66e7b73 100644
--- a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
+++ b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
@@ -171,10 +171,11 @@ func GetPersonInfoList(c *gin.Context) {
 	queryChild := c.Query("query_child")
 	bUse := c.Query("b_use")
 	personName := c.Query("person_name")
+	queryBureauChild := c.Query("query_bureau_child")
 	pageNumber := c.Query("pageNumber")
 	pageSize := c.Query("pageSize")
 
-	res, err := ImRelateDao.GetPersonList(bureauId, orgId, queryChild, bUse, personName, pageNumber, pageSize)
+	res, err := ImRelateDao.GetPersonList(bureauId, orgId, queryChild, bUse, personName, queryBureauChild, pageNumber, pageSize)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{"success": false, "info": "获取人员信息列表失败！"})
 		return
diff --git a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
index bb449b9e..f6b9971b 100644
--- a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
+++ b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
@@ -381,7 +381,7 @@ func GetServerLocation() string {
 	return CommonUtil.ConvertInterfaceToString(resObj["common.server.location"])
 }
 
-func GetPersonList(bureauId string, orgId string, queryChild string, bUse string, personName string, pageNumber string, pageSize string) (string, error) {
+func GetPersonList(bureauId string, orgId string, queryChild string, bUse string, personName string, queryBureauChild string,pageNumber string, pageSize string) (string, error) {
 	req := httplib.Get(fmt.Sprintf("%s/dsideal_yy/admin/new_base/personInfo_GetPersonInfoList", ConfigUtil.DsidealYy))
 
 	req.Param("bureau_id", bureauId)
@@ -389,7 +389,7 @@ func GetPersonList(bureauId string, orgId string, queryChild string, bUse string
 	req.Param("query_child", queryChild)
 	req.Param("b_use", bUse)
 	req.Param("person_name", personName)
-	req.Param("query_bureau_child", "false")
+	req.Param("query_bureau_child", queryBureauChild)
 	req.Param("pageNumber", pageNumber)
 	req.Param("pageSize", pageSize)