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

…tion-gateway into test

# Conflicts:
#	pkg/application/web/orgs/service/orgs.go

@@ -109,7 +109,12 @@ func (srv CompanyCreditAccountService) CreditAccountPaySearch(cmd *command.Credi
 	}
 	}
 	var items = make([]*dto.CreditAccountItem, 0)
 	var items = make([]*dto.CreditAccountItem, 0)
 	if len(cooperationContractNumbers) == 0 {
 	if len(cooperationContractNumbers) == 0 {
-		return items, nil
+		return map[string]interface{}{
+			"grid": map[string]interface{}{
+				"list": items,
+				"sum":  0,
+			},
+		}, nil
 	}
 	}
 
 
 	var beginTime, endTime time.Time
 	var beginTime, endTime time.Time
@@ -176,10 +181,14 @@ func (srv CompanyCreditAccountService) PaymentHistoryStatistics(cmd *command.Cre
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 		cmd.Operator)
 		cmd.Operator)
 
 
-	var response = struct {
+	type responseType struct {
 		RankItems          interface{} `json:"rankItems"`
 		RankItems          interface{} `json:"rankItems"`
 		TotalPaymentAmount interface{} `json:"totalPaymentAmount"`
 		TotalPaymentAmount interface{} `json:"totalPaymentAmount"`
-	}{}
+	}
+	var response = responseType{
+		RankItems:          []struct{}{},
+		TotalPaymentAmount: 0,
+	}
 	cooperationContractNumbers, err := gateway.RelevantCooperationContractNumbers(allied_creation_cooperation.RelevantCooperationContractNumbers, map[string]interface{}{
 	cooperationContractNumbers, err := gateway.RelevantCooperationContractNumbers(allied_creation_cooperation.RelevantCooperationContractNumbers, map[string]interface{}{
 		"companyId": cmd.Operator.CompanyId,
 		"companyId": cmd.Operator.CompanyId,
 		"orgId":     cmd.Operator.OrgId,
 		"orgId":     cmd.Operator.OrgId,

@@ -188,7 +188,7 @@ func (srv UserService) DepartmentsUsers(departmentsUsersQuery *query.Departments
 		CompanyId:      departmentsUsersQuery.Operator.CompanyId,
 		CompanyId:      departmentsUsersQuery.Operator.CompanyId,
 		OrganizationId: departmentsUsersQuery.Operator.OrgId,
 		OrganizationId: departmentsUsersQuery.Operator.OrgId,
 		UserType:       domain.UserTypeEmployee, //TODO:是否要共创用户
 		UserType:       domain.UserTypeEmployee, //TODO:是否要共创用户
-		InEnableStatus: []int{domain.UserStatusEnable, domain.UserStatusDisable},
+		InEnableStatus: []int{domain.UserStatusEnable},
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())