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 @@
-
-
-
-
-
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)