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

@@ -66,8 +66,8 @@ func (cooperationModeService *CooperationModeService) ListCooperationMode(listCo
 		OrganizationName:    listCooperationModeQuery.OrganizationName,
 		OrganizationName:    listCooperationModeQuery.OrganizationName,
 		CompanyId:           listCooperationModeQuery.Operator.CompanyId,
 		CompanyId:           listCooperationModeQuery.Operator.CompanyId,
 		UserId:              0,
 		UserId:              0,
-		OrgIds:              listCooperationModeQuery.Operator.OrgIds,
-		OrgId:               0,
+		OrgIds:              nil,
+		OrgId:               listCooperationModeQuery.Operator.OrgId,
 		UserBaseId:          0,
 		UserBaseId:          0,
 	})
 	})
 	if err != nil {
 	if err != nil {

@@ -151,7 +151,7 @@ func (cooperationProjectService *CooperationProjectService) ListCooperationProje
 		PageSize:                 999,
 		PageSize:                 999,
 		CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
 		CooperationProjectNumber: listCooperationProjectQuery.MatchCooperationProjectNumber,
 		CompanyId:                listCooperationProjectQuery.Operator.CompanyId,
 		CompanyId:                listCooperationProjectQuery.Operator.CompanyId,
-		OrgIds:                   listCooperationProjectQuery.Operator.OrgIds,
+		OrgId:                    listCooperationProjectQuery.Operator.OrgId,
 	})
 	})
 	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())

@@ -83,12 +83,12 @@ func (controller *CooperationModeController) SearchCooperationMode() {
 func (controller *CooperationModeController) ListCooperationMode() {
 func (controller *CooperationModeController) ListCooperationMode() {
 	cooperationModeService := service.NewCooperationModeService(nil)
 	cooperationModeService := service.NewCooperationModeService(nil)
 	listCooperationModeQuery := &query.ListCooperationModeQuery{}
 	listCooperationModeQuery := &query.ListCooperationModeQuery{}
-	err := controller.Unmarshal(listCooperationModeQuery)
-	if err != nil {
-		log.Logger.Debug("json err:" + err.Error())
-		controller.Response(nil, err)
-		return
-	}
+	// err := controller.Unmarshal(listCooperationModeQuery)
+	// if err != nil {
+	// 	log.Logger.Debug("json err:" + err.Error())
+	// 	controller.Response(nil, err)
+	// 	return
+	// }
 	listCooperationModeQuery.Operator = controller.GetOperator()
 	listCooperationModeQuery.Operator = controller.GetOperator()
 	listCooperationModeQuery.PageNumber = 1
 	listCooperationModeQuery.PageNumber = 1
 	listCooperationModeQuery.PageSize = 999
 	listCooperationModeQuery.PageSize = 999