Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/allied-crea…

…tion-gateway into test

# Conflicts:
#	pkg/port/beego/controllers/web_client/excel_data_controller.go

@@ -23,6 +23,7 @@ func (srv *CreditAccountService) ListCreditAccount(listQuery *query.ListCreditAc
 		CreditAccountOrderNum: listQuery.CreditAccountOrderNum,
 		CreditAccountOrderNum: listQuery.CreditAccountOrderNum,
 		ParticipatorName:      listQuery.Participator,
 		ParticipatorName:      listQuery.Participator,
 		CompanyId:             listQuery.Operator.CompanyId,
 		CompanyId:             listQuery.Operator.CompanyId,
+		OrgIds:                listQuery.Operator.OrgIds,
 	})
 	})
 	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())

@@ -79,6 +79,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
 		PageNumber:                   searchDividendsEstimateQuery.PageNumber,
 		PageNumber:                   searchDividendsEstimateQuery.PageNumber,
 		PageSize:                     searchDividendsEstimateQuery.PageSize,
 		PageSize:                     searchDividendsEstimateQuery.PageSize,
 		CompanyId:                    searchDividendsEstimateQuery.Operator.CompanyId,
 		CompanyId:                    searchDividendsEstimateQuery.Operator.CompanyId,
+		OrgIds:                       searchDividendsEstimateQuery.Operator.OrgIds,
 	})
 	})
 	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())

@@ -40,15 +40,16 @@ type (
 //查询分红预算单
 //查询分红预算单
 type (
 type (
 	ReqDividendsEstimateSearch struct {
 	ReqDividendsEstimateSearch struct {
-		DividendsEstimateOrderNumber string `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号
-		CooperationContractNumber    string `json:"orderOrReturnedOrderNum"`      //合约编号
-		DividendsType                int    `json:"dividendsType"`                //分红类型，1订单分红，2退货冲销，3金额激励
-		PageNumber                   int    `json:"pageNumber"`
-		PageSize                     int    `json:"pageSize"`
-		CompanyId                    int64  `json:"companyId"`   // 公司ID，通过集成REST上下文获取
-		OrgId                        int64  `json:"orgId"`       // 组织机构ID
-		UserId                       int64  `json:"userId"`      // 用户ID，
-		UserBaseId                   int64  ` json:"userBaseId"` // 用户基础数据id
+		DividendsEstimateOrderNumber string  `json:"dividendsEstimateOrderNumber"` //承接人分红预算单号
+		CooperationContractNumber    string  `json:"orderOrReturnedOrderNum"`      //合约编号
+		DividendsType                int     `json:"dividendsType"`                //分红类型，1订单分红，2退货冲销，3金额激励
+		PageNumber                   int     `json:"pageNumber"`
+		PageSize                     int     `json:"pageSize"`
+		CompanyId                    int64   `json:"companyId"`   // 公司ID，通过集成REST上下文获取
+		OrgId                        int64   `json:"orgId"`       // 组织机构ID
+		OrgIds                       []int64 `json:"orgIds"`      //用户关联的组织
+		UserId                       int64   `json:"userId"`      // 用户ID，
+		UserBaseId                   int64   ` json:"userBaseId"` // 用户基础数据id
 	}
 	}
 
 
 	DataDividendsEstimateSearch struct {
 	DataDividendsEstimateSearch struct {

@@ -11,7 +11,7 @@ type SystemSettingController struct {
 	baseController
 	baseController
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingSearch() {
+func (controller *SystemSettingController) SystemSettingSearch() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	settingListQuery := &query.SettingListQuery{}
 	settingListQuery := &query.SettingListQuery{}
 	err := controller.Unmarshal(settingListQuery)
 	err := controller.Unmarshal(settingListQuery)
@@ -23,7 +23,7 @@ func (controller SystemSettingController) SystemSettingSearch() {
 	controller.Response(data, err)
 	controller.Response(data, err)
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingGet() {
+func (controller *SystemSettingController) SystemSettingGet() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	q := &query.SettingGetQuery{}
 	q := &query.SettingGetQuery{}
 	err := controller.Unmarshal(q)
 	err := controller.Unmarshal(q)
@@ -36,7 +36,7 @@ func (controller SystemSettingController) SystemSettingGet() {
 
 
 }
 }
 
 
-func (controller SystemSettingController) SystemSettingUpdate() {
+func (controller *SystemSettingController) SystemSettingUpdate() {
 	systemSettingService := service.NewSystemSettingService(nil)
 	systemSettingService := service.NewSystemSettingService(nil)
 	q := &command.SettingUpdateCommand{}
 	q := &command.SettingUpdateCommand{}
 	err := controller.Unmarshal(q)
 	err := controller.Unmarshal(q)