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

@@ -292,8 +292,10 @@ func (svr AuthService) OrgSwitch(switchOrgCommand *command.SwitchOrgCommand) (in
 	}
 	}
 	var userId int64
 	var userId int64
 	if v, ok := token["userId"]; ok {
 	if v, ok := token["userId"]; ok {
-		if userId, ok = v.(int64); !ok {
+		if vInt, ok := v.(int); !ok || vInt == 0 {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, "用户不存在")
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, "用户不存在")
+		} else {
+			userId = int64(vInt)
 		}
 		}
 	}
 	}
 	user, err := svr.getUserInfo(domain.Operator{UserId: userId})
 	user, err := svr.getUserInfo(domain.Operator{UserId: userId})
@@ -311,7 +313,7 @@ func (svr AuthService) OrgSwitch(switchOrgCommand *command.SwitchOrgCommand) (in
 	var res = map[string]interface{}{
 	var res = map[string]interface{}{
 		"user":        user,
 		"user":        user,
 		"accessMenus": resultMenu.Menus,
 		"accessMenus": resultMenu.Menus,
-		"token":       token["token"],
+		"access":      token["token"],
 	}
 	}
 	return res, nil
 	return res, nil
 }
 }

@@ -21,7 +21,7 @@ type UpdateCooperationProjectCommand struct {
 	// 共创发起人id
 	// 共创发起人id
 	CooperationProjectSponsor string `json:"cooperationProjectSponsor,omitempty"`
 	CooperationProjectSponsor string `json:"cooperationProjectSponsor,omitempty"`
 	// 项目承接对象
 	// 项目承接对象
-	CooperationProjectUndertakerType []int32 `json:"cooperationProjectUndertakerType,omitempty"`
+	CooperationProjectUndertakerType []int32 `json:"cooperationProjectUndertakerTypes,omitempty"`
 	// 共创项目描述
 	// 共创项目描述
 	CooperationProjectDescription string `json:"cooperationProjectDescription" valid:"Required"`
 	CooperationProjectDescription string `json:"cooperationProjectDescription" valid:"Required"`
 	//图片
 	//图片