fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wwq' into dev

Browse Source
This commit is contained in:
bx1834938347-prog 2026-01-05 16:17:11 +08:00
commit 1612144609
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/service/cron/cron.go
View File

@ -258,11 +258,11 @@ func GetImportData(c *gin.Context) {
service.Error(c, errors.New("用户查询失败")) service.Error(c, errors.New("用户查询失败"))
return return
} }
fmt.Println(res.UserList)
subNames := make(map[string]struct{}, len(res.UserList)) subNames := make(map[string]struct{}, len(res.UserList))
for _, v := range res.UserList { for _, v := range res.UserList {
subNames[v.SubNum] = struct{}{} subNames[v.SubNum] = struct{}{}
} }
fmt.Println(subNames)
//检查subname是否正确是否存在 //检查subname是否正确是否存在
for _, v := range readExcelResult { for _, v := range readExcelResult {
if _, ok := subNames[v.SubName]; !ok { if _, ok := subNames[v.SubName]; !ok {
@ -272,11 +272,11 @@ func GetImportData(c *gin.Context) {
} }
//检查subname和name是否匹配 //检查subname和name是否匹配
subNameFindExcelData := make(map[string]excelData, len(readExcelResult)) subNameFindExcelData := make(map[string]excelData, len(readExcelResult))
for _, v := range subNameFindExcelData { for _, v := range readExcelResult {
subNameFindExcelData[v.SubName] = v subNameFindExcelData[v.SubName] = v
} }
subNameFindID := make(map[string]uint64, len(readExcelResult)) subNameFindID := make(map[string]uint64, len(readExcelResult))
result := make([]excelDataResult, len(readExcelResult)) result := make([]excelDataResult, 0, len(readExcelResult))
for _, v := range res.UserList { for _, v := range res.UserList {
subNameFindID[v.SubNum] = v.Id subNameFindID[v.SubNum] = v.Id