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

转到一个项目

作者 yangfu
提交 65428b79d8613b60168b7e5cde17a125a5abc854 1 个父辈 a9a6dc61

模板修改

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 3 行删除
@@ -693,7 +693,7 @@ func (svr AuthService) GetCompanyOrgsByUser(queryParam *query.GetCompanyOrgsByUs @@ -693,7 +693,7 @@ func (svr AuthService) GetCompanyOrgsByUser(queryParam *query.GetCompanyOrgsByUs
693 693
694 for i := range result.Users { 694 for i := range result.Users {
695 user := result.Users[i] 695 user := result.Users[i]
696 - if _, ok := mapCompany[user.Company.CompanyId]; !ok { 696 + if _, ok := mapCompany[user.Company.CompanyId]; !ok && len(user.UserOrg) > 0 {
697 companys = append(companys, dto.CompanyItem{ 697 companys = append(companys, dto.CompanyItem{
698 CompanyId: user.Company.CompanyId, 698 CompanyId: user.Company.CompanyId,
699 CompanyName: user.Company.CompanyName, 699 CompanyName: user.Company.CompanyName,
@@ -203,9 +203,9 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import @@ -203,9 +203,9 @@ func (srv ExcelDataService) FileImportTemplate(importDataCommand *command.Import
203 var mapTemplate = map[string]string{ 203 var mapTemplate = map[string]string{
204 domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807485_EaxECeRz23WpzrMZmbwdEPRJ3Pdxpx5X.xlsx", 204 domain.ImportCompanyUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807485_EaxECeRz23WpzrMZmbwdEPRJ3Pdxpx5X.xlsx",
205 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx", 205 domain.ImportOrganization: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210916/object/1631807490_r2XWhGmbWWmpbeePBkZ3EJQFKcZEMpEm.xlsx",
206 - domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210917/object/1631843469_DykNwexeYYtzxzbwsER5RrzCS7QRwGmd.xlsx", 206 + domain.ImportDividendsOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743206_NPYTKw6RGhXn4TpYNEQhGGdCkXKXTnxM.xlsx",
207 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx", 207 domain.ImportCooperationUser: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635345_SbfzmkXjQHhCwPw4MB7zb5EBBtdp2MSE.xlsx",
208 - domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210926/object/1632635351_EbDmBxjRf2hNCfZsZWK26fDctTJ4Qzht.xlsx", 208 + domain.ImportDividendsReturnOrders: "https://timeless-world.oss-cn-shenzhen.aliyuncs.com/open-api/dev_online/20210927/object/1632743214_rNHm6ZBXZaC5xKTrsE7M4h45MY6n6Ff3.xlsx",
209 } 209 }
210 var url string 210 var url string
211 var ok bool 211 var ok bool