字典数据排序

@@ -481,7 +481,7 @@ func (svr AuthService) getUserInfo(operator domain.Operator) (interface{}, error
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		}
 		}
 		var user = map[string]interface{}{
 		var user = map[string]interface{}{
-			"userId": resultUser.UserBaseID,
+			"userId": resultUser.UserID,
 			//"userOpenId": fmt.Sprintf("%v",resultUser.UserBaseID),
 			//"userOpenId": fmt.Sprintf("%v",resultUser.UserBaseID),
 			"userInfo": map[string]interface{}{
 			"userInfo": map[string]interface{}{
 				"userName":   resultUser.UserInfo.UserName,
 				"userName":   resultUser.UserInfo.UserName,
@@ -505,7 +505,7 @@ func (svr AuthService) getUserInfo(operator domain.Operator) (interface{}, error
 	}
 	}
 
 
 	var user = map[string]interface{}{
 	var user = map[string]interface{}{
-		"userId":   resultUser.UserBaseId,
+		"userId":   resultUser.UserId,
 		"userType": resultUser.UserType,
 		"userType": resultUser.UserType,
 		"userCode": resultUser.UserCode,
 		"userCode": resultUser.UserCode,
 		"userInfo": map[string]interface{}{
 		"userInfo": map[string]interface{}{

@@ -43,7 +43,9 @@ func (srv *CommonService) GetDictionaryByCode(getDictionaryQuery *query.GetDicti
 			}
 			}
 		}
 		}
 	}
 	}
-	return response, nil
+	return map[string]interface{}{
+		"dictionarys": response,
+	}, nil
 }
 }
 
 
 //LatestVersionInfo 版本升级
 //LatestVersionInfo 版本升级

@@ -267,7 +267,7 @@ func (srv CooperationProjectService) PersonSearchCooperationProjectShareInfoAtta
 
 
 // PersonSearchCooperationProject  共创用户获取共创项目列表
 // PersonSearchCooperationProject  共创用户获取共创项目列表
 func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(projectQuery *command.PersonSearchCooperationProjectQuery) (int, interface{}, error) {
 func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(projectQuery *command.PersonSearchCooperationProjectQuery) (int, interface{}, error) {
-	//extQueries := extQuires(projectQuery.Operator)
+	extQueries := extQuires(projectQuery.Operator)
 	if projectQuery.Operator.UserBaseId == 0 {
 	if projectQuery.Operator.UserBaseId == 0 {
 		return 0, []struct{}{}, nil
 		return 0, []struct{}{}, nil
 	}
 	}
@@ -288,10 +288,12 @@ func (srv CooperationProjectService) PersonSearchCooperationProjectStarred(proje
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageNumber: projectQuery.PageNumber + 1, //手机序号从0开始的
 		PageSize:   projectQuery.PageSize,
 		PageSize:   projectQuery.PageSize,
 		//Status:                  1, //搜索状态为“招标中”项目
 		//Status:                  1, //搜索状态为“招标中”项目
-		Keyword:                 projectQuery.Keyword,
-		OrgIds:                  userInfo.FavoriteOrg(),
-		IsSkipFetchProjectModel: true,
-		SortByStatus:            1,
+		Keyword:                                projectQuery.Keyword,
+		OrgIds:                                 userInfo.FavoriteOrg(),
+		IsSkipFetchProjectModel:                true,
+		SortByStatus:                           1,
+		SearchCooperationProjectExtQueriesFlag: 1,
+		SearchCooperationProjectExtQueries:     extQueries,
 	})
 	})
 	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())

@@ -164,12 +164,17 @@ func (srv PersonStatisticsService) CompanyStatistics(cmd *command.CooperationPer
 		if user.Company == nil {
 		if user.Company == nil {
 			continue
 			continue
 		}
 		}
-		cooperationCompanyStatisticsResponses[i].Company = domain.Company{
-			CompanyID:   user.Org.OrgId,
-			CompanyName: user.Org.OrgName,
-			Logo:        user.Company.Logo,
+		for j := range cooperationCompanyStatisticsResponses {
+			if user.Org != nil && cooperationCompanyStatisticsResponses[j].OrgId == int64(user.Org.OrgId) {
+				cooperationCompanyStatisticsResponses[j].Company = domain.Company{
+					CompanyID:   user.Org.OrgId,
+					CompanyName: user.Org.OrgName,
+					Logo:        user.Company.Logo,
+				}
+				values = append(values, cooperationCompanyStatisticsResponses[j])
+			}
 		}
 		}
-		values = append(values, cooperationCompanyStatisticsResponses[i])
+
 	}
 	}
 	return map[string]interface{}{
 	return map[string]interface{}{
 		"list": values,
 		"list": values,