diff --git a/dsBaseWeb/Business/BaseOrganization/BaseOrganizationController/BaseOrganizationController.go b/dsBaseWeb/Business/BaseOrganization/BaseOrganizationController/BaseOrganizationController.go index 21e16699..4f8c4457 100644 --- a/dsBaseWeb/Business/BaseOrganization/BaseOrganizationController/BaseOrganizationController.go +++ b/dsBaseWeb/Business/BaseOrganization/BaseOrganizationController/BaseOrganizationController.go @@ -711,6 +711,7 @@ func PageSchoolInfo(c *gin.Context) { // @Param page query int true "第几页" // @Param limit query int true "一页显示多少条" // @Param areaCode query string true "行政区划编码" +// @Param orgId query string false "学校ID,增加学校时无需传,修改学校时需要传被修改学校的ID" // @Success 200 {object} Model.Res // @Router /base/organization/PageMainSchoolInfo [get] // @X-EmptyLimit ["page","limit","areaCode"] @@ -727,6 +728,8 @@ func PageMainSchoolInfo(c *gin.Context) { page := CommonUtil.ConvertStringToInt32(c.Query("page")) //一页显示多少条 limit := CommonUtil.ConvertStringToInt32(c.Query("limit")) + //学校ID + orgId := c.Query("orgId") //行政区划编码 areaCode := c.Query("areaCode") //操作人 @@ -740,7 +743,7 @@ func PageMainSchoolInfo(c *gin.Context) { } //操作IP actionIpAddress := c.ClientIP() - r, err := BaseOrganizationService.PageMainSchoolInfo(page, limit, areaCode, actionPersonId, actionIpAddress) + r, err := BaseOrganizationService.PageMainSchoolInfo(page, limit, areaCode, orgId, actionPersonId, actionIpAddress) if err != nil { c.JSON(http.StatusOK, Model.Res{ Success: false, diff --git a/dsBaseWeb/Business/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go b/dsBaseWeb/Business/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go index 6f91614e..58c0dabc 100644 --- a/dsBaseWeb/Business/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go +++ b/dsBaseWeb/Business/BaseOrganization/BaseOrganizationService/BaseOrganizationService.go @@ -82,8 +82,8 @@ func PageSchoolInfo(page int32, limit int32, areaCode string, xxbxlxm string, or return Reply, err } -func PageMainSchoolInfo(page int32, limit int32, areaCode string, actionPersonId string, actionIpAddress string) (*BaseOrganizationProto.Reply, error) { - Reply, err := PageBaseOrganization(BaseOrganizationProto.QueryArg{Page: page, Limit: limit, AreaCode: areaCode, OrgType: 2, BUse: 1, IsMainSchool: true, Xxbxlxm: "-1", ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) +func PageMainSchoolInfo(page int32, limit int32, areaCode string, orgId string, actionPersonId string, actionIpAddress string) (*BaseOrganizationProto.Reply, error) { + Reply, err := PageBaseOrganization(BaseOrganizationProto.QueryArg{Page: page, Limit: limit, AreaCode: areaCode, BureauId: orgId, OrgType: 2, BUse: 1, IsMainSchool: true, Xxbxlxm: "-1", ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) if Reply.List != "[]" { codeArr := CommonUtil.ListCollectAttributes(Reply.List, "xxbxlxm") DictReply, _ := SysDictService.PageSysDictMultipleDictCode(SysDictProto.MultipleQueryArg{DictKind: "xxbxlxm", MultipleDictCode: codeArr, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress})