Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev
正在显示
2 个修改的文件
包含
2 行增加
和
1 行删除
| @@ -120,6 +120,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | @@ -120,6 +120,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics | ||
| 120 | CompanyId: cmd.Operator.CompanyId, | 120 | CompanyId: cmd.Operator.CompanyId, |
| 121 | OrganizationId: cmd.Operator.OrgId, | 121 | OrganizationId: cmd.Operator.OrgId, |
| 122 | UserType: domain.UserTypeCooperation, | 122 | UserType: domain.UserTypeCooperation, |
| 123 | + InEnableStatus: []int{domain.UserStatusEnable}, | ||
| 123 | }) | 124 | }) |
| 124 | if err != nil { | 125 | if err != nil { |
| 125 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) | 126 | return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) |
| @@ -31,7 +31,7 @@ type UserDetail struct { | @@ -31,7 +31,7 @@ type UserDetail struct { | ||
| 31 | IndustryCategory string `json:"industryCategory"` | 31 | IndustryCategory string `json:"industryCategory"` |
| 32 | RegisteredTime time.Time `json:"registeredTime"` | 32 | RegisteredTime time.Time `json:"registeredTime"` |
| 33 | Status int64 `json:"status"` | 33 | Status int64 `json:"status"` |
| 34 | - Log string `json:"log"` | 34 | + Log string `json:"logo"` |
| 35 | Address string `json:"address"` | 35 | Address string `json:"address"` |
| 36 | SystemName string `json:"systemName"` | 36 | SystemName string `json:"systemName"` |
| 37 | } `json:"company,omitempty"` | 37 | } `json:"company,omitempty"` |
-
请 注册 或 登录 后发表评论