更新

@@ -34,7 +34,7 @@ func ToCooperationProjectItem(projecetParam *allied_creation_cooperation.Coopera
 	}
 	data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId
 	data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId
-	data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.Phone
+	data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.UserPhone
 	data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName
 	return &data
 }
@@ -77,7 +77,7 @@ func ToCooperationProjectInfo(projecetParam *allied_creation_cooperation.Coopera
 	}
 	data.CooperationProjectSponsor.UsersId = projecetParam.CooperationProjectSponsor.UsersId
 	data.CooperationProjectSponsor.UserInfo.UsersId = projecetParam.CooperationProjectSponsor.UsersId
-	data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.Phone
+	data.CooperationProjectSponsor.UserInfo.Phone = projecetParam.CooperationProjectSponsor.UserInfo.UserPhone
 	data.CooperationProjectSponsor.UserInfo.UsersName = projecetParam.CooperationProjectSponsor.UserInfo.UsersName
 	return &data
 }

@@ -70,7 +70,10 @@ func ToCooperationProjectInfo(param *allied_creation_cooperation.CooperationProj
 	data.CooperationProjectSponsor.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode
 	data.CooperationProjectSponsor.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName
 	data.CooperationProjectSponsor.UserId = param.CooperationProjectSponsor.UsersId
-	data.CooperationProjectSponsor.UserInfo = param.CooperationProjectSponsor.UserInfo
+	data.CooperationProjectSponsor.UserInfo.Phone = param.CooperationProjectSponsor.UserInfo.UserPhone
+	data.CooperationProjectSponsor.UserInfo.UsersId = param.CooperationProjectSponsor.UsersId
+	data.CooperationProjectSponsor.UserInfo.UsersName = param.CooperationProjectSponsor.UserInfo.UsersName
+	data.CooperationProjectSponsor.UserInfo.UsersCode = param.CooperationProjectSponsor.UserInfo.UsersCode
 	return &data
 }
 

@@ -88,7 +88,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	var (
-		applications []dto.CooperationApplicationItem
+		applications = []dto.CooperationApplicationItem{}
 	)
 	for i := range resultApplication.Grid.List {
 		item := dto.ToCooperationApplicationItem(&resultApplication.Grid.List[i])

@@ -38,19 +38,19 @@ type CooperationProject struct {
 	CooperationProjectPublisher   struct {
 		UsersId  int `json:"userId,string"`
 		UserInfo struct {
-			UsersName string `json:"userName"`
-			UsersCode string `json:"userCode"`
-			Phone     string `json:"phone"`
-			UsersId   int    `json:"userId,string,"`
+			UsersName   string `json:"userName"`
+			UsersCode   string `json:"userCode"`
+			UserPhone   string `json:"userPhone"`
+			UserAccount string `json:"userAccount"`
 		} `json:"userInfo"`
 	} `json:"cooperationProjectPublisher"` //项目发布人，即操作人
 	CooperationProjectSponsor struct {
 		UsersId  int `json:"userId,string"`
 		UserInfo struct {
-			UsersName string `json:"userName"`
-			UsersCode string `json:"userCode"`
-			Phone     string `json:"phone"`
-			UsersId   int    `json:"userId,string"`
+			UsersName   string `json:"userName"`
+			UsersCode   string `json:"userCode"`
+			UserPhone   string `json:"userPhone"`
+			UserAccount string `json:"userAccount"`
 		} `json:"userInfo"`
 	} `json:"cooperationProjectSponsor"` //项目发起人
 	CooperationProjectUndertakerType []int `json:"cooperationProjectUndertakerTypes"` //共创合约承接对象，1员工，2共创用户，3公开

@@ -31,7 +31,9 @@ func (controller *DictionaryController) UpdateDictionary() {
 	if err != nil {
 		log.Logger.Debug("json err:" + err.Error())
 	}
+	dictionaryId, _ := controller.GetInt64("::dictionaryId")
 	updateCommand.Operator = controller.GetOperator()
+	updateCommand.DictionaryId = dictionaryId
 	data, err := dictionaryService.UpdateDictionay(updateCommand)
 	controller.Response(data, err)
 }
@@ -51,10 +53,9 @@ func (controller *DictionaryController) RemoveDictionary() {
 func (controller *DictionaryController) GetDictionary() {
 	dictionaryService := service.NewDictionayService(nil)
 	getQuery := &query.GetDictionaryQuery{}
-	err := controller.Unmarshal(getQuery)
-	if err != nil {
-		log.Logger.Debug("json err:" + err.Error())
-	}
+
+	dictionaryId, _ := controller.GetInt64("::dictionaryId")
+	getQuery.DictionaryId = int(dictionaryId)
 	getQuery.Operator = controller.GetOperator()
 	data, err := dictionaryService.GetDictionay(getQuery)
 	controller.Response(data, err)