Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -477,7 +477,7 @@ func (svr AuthService) getUserInfo(operator domain.Operator) (interface{}, error
 			"orgCode":   resultOrg.OrgCode,
 			"orgCode":   resultOrg.OrgCode,
 			"companyId": resultOrg.CompanyID,
 			"companyId": resultOrg.CompanyID,
 		},
 		},
-		"currentLoginOrg": resultUser.Org,
+		//"currentLoginOrg": resultUser.Org,
 		"favoriteMenus": resultUser.FavoriteMenus,
 		"favoriteMenus": resultUser.FavoriteMenus,
 	}
 	}
 	return user, nil
 	return user, nil

@@ -48,5 +48,5 @@ type PersonSearchCooperationProjectQuery struct {
 	// 查询限制
 	// 查询限制
 	PageSize int `json:"pageSize" valid:"Required"`
 	PageSize int `json:"pageSize" valid:"Required"`
 	//
 	//
-	OrgId int `json:"orgId"`
+	OrgId int64 `json:"orgId"`
 }
 }

@@ -103,11 +103,12 @@ func (srv CooperationProjectService) SearchCooperationProject(projectQuery *comm
 func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery *command.PersonSearchCooperationProjectQuery) (int, interface{}, error) {
 func (srv CooperationProjectService) PersonSearchCooperationProject(projectQuery *command.PersonSearchCooperationProjectQuery) (int, interface{}, error) {
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 		projectQuery.Operator)
 		projectQuery.Operator)
-	orgidStr := strconv.Itoa(projectQuery.OrgId)
+	//orgidStr := strconv.Itoa(projectQuery.OrgId)
 	result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
 	result, err := creationCooperationGateway.CooperationProjectsSearch(allied_creation_cooperation.ReqCooperationProjectSearch{
 		PageNumber: projectQuery.PageNumber,
 		PageNumber: projectQuery.PageNumber,
 		PageSize:   projectQuery.PageSize,
 		PageSize:   projectQuery.PageSize,
-		OrgIds:     []string{orgidStr},
+		OrgId:      projectQuery.OrgId,
+		UserBaseId: projectQuery.Operator.UserBaseId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -156,10 +156,13 @@ type (
 		CooperationProjectName string `json:"cooperationProjectName"`
 		CooperationProjectName string `json:"cooperationProjectName"`
 		// 共创项目状态，1招标中，2结束 0 全部
 		// 共创项目状态，1招标中，2结束 0 全部
 		Status int `json:"status"`
 		Status int `json:"status"`
-		//
+		// 组织机构ID
+		OrgId                        int64    `cname:"组织机构ID" json:"orgId"`
 		OrgIds                       []string `json:"orgIds"`
 		OrgIds                       []string `json:"orgIds"`
 		CooperationProjectNumberLike string   `json:"cooperationProjectNumberLike"`
 		CooperationProjectNumberLike string   `json:"cooperationProjectNumberLike"`
 		//OffsetLimitFlag bool `json:"offsetLimitFlag"`
 		//OffsetLimitFlag bool `json:"offsetLimitFlag"`
+		// 用户基础数据id
+		UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId"`
 	}
 	}
 
 
 	DataCooperationProjectSearch struct {
 	DataCooperationProjectSearch struct {

@@ -111,6 +111,7 @@ func CheckAccessToken2() web.FilterFunc {
 			"/v1/auth/reset-password":                    "",
 			"/v1/auth/reset-password":                    "",
 			"/v1/auth/refresh-token":                     "",
 			"/v1/auth/refresh-token":                     "",
 			"/v1/app/cooperation-projects/person/search": "",
 			"/v1/app/cooperation-projects/person/search": "",
+			"/v1/common/dictionary/search":               "",
 		}
 		}
 		var err error
 		var err error
 		if filterUrl, err := url.Parse(ctx.Request.RequestURI); err == nil {
 		if filterUrl, err := url.Parse(ctx.Request.RequestURI); err == nil {