allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 ac661064b7394babe9c881ed7ebd188200ebe394 2 个父辈 cde2d066 c33e0b17

Merge branch 'test' into dev

内嵌 并排对比
正在显示 2 个修改的文件 包含 2 行增加 和 1 行删除
@@ -283,7 +283,7 @@ func (srv ExcelDataService) fieldValueAllEmpty(param map[string]string) bool { @@ -283,7 +283,7 @@ func (srv ExcelDataService) fieldValueAllEmpty(param map[string]string) bool {
283 // FileImportTemplate 导入模板 283 // FileImportTemplate 导入模板
284 func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.ImportDataCommand) (interface{}, error) { 284 func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.ImportDataCommand) (interface{}, error) {
285 var mapTemplate = map[string]string{ 285 var mapTemplate = map[string]string{
286 - domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807485_EaxECeRz23WpzrMZmbwdEPRJ3Pdxpx5X.xlsx", 286 + domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/opportunity/dev_online/20220222/object/1645495589_cFNDGRTfCxYMZ5hPYzfKxThYd3ywARRz.xlsx",
287 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx", 287 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx",
288 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx", 288 domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx",
289 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx", 289 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx",
@@ -45,6 +45,7 @@ func RedirectInternalService(prefix string, svr internalService) web.FilterFunc @@ -45,6 +45,7 @@ func RedirectInternalService(prefix string, svr internalService) web.FilterFunc
45 if ok && loginToken.CompanyId > 0 && loginToken.OrgId > 0 { 45 if ok && loginToken.CompanyId > 0 && loginToken.OrgId > 0 {
46 req.Header("companyId", fmt.Sprintf("%v", loginToken.CompanyId)) 46 req.Header("companyId", fmt.Sprintf("%v", loginToken.CompanyId))
47 req.Header("orgId", fmt.Sprintf("%v", loginToken.OrgId)) 47 req.Header("orgId", fmt.Sprintf("%v", loginToken.OrgId))
  48 + req.Header("userId", fmt.Sprintf("%v", loginToken.UserId))
48 orgIdList := make([]string, 0) 49 orgIdList := make([]string, 0)
49 for i := range loginToken.OrgIds { 50 for i := range loginToken.OrgIds {
50 orgIdList = append(orgIdList, fmt.Sprintf("%d", loginToken.OrgIds[i])) 51 orgIdList = append(orgIdList, fmt.Sprintf("%d", loginToken.OrgIds[i]))