|
@@ -71,12 +71,15 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
|
|
return nil, 0, err
|
|
return nil, 0, err
|
|
}
|
|
}
|
|
|
|
|
|
- fmt.Println("secTaskInfoList:", secTaskInfoList)
|
|
|
|
|
|
+ fmt.Println("secTaskInfoList:", &secTaskInfoList)
|
|
newSecTaskInfoList := pack.GormSecTaskListToHttpSecTaskList(secTaskInfoList)
|
|
newSecTaskInfoList := pack.GormSecTaskListToHttpSecTaskList(secTaskInfoList)
|
|
- fmt.Println("newSecTaskInfoList:", newSecTaskInfoList)
|
|
|
|
|
|
+ fmt.Println("newSecTaskInfoList:", &newSecTaskInfoList)
|
|
|
|
|
|
for i, secTask := range newSecTaskInfoList {
|
|
for i, secTask := range newSecTaskInfoList {
|
|
- newSecTaskInfoList[i].DetailAddr = GetRegion(ctx, secTask.RegionCode) + secTask.DetailAddr
|
|
|
|
|
|
+ if secTask.RegionCode != 0 {
|
|
|
|
+ newSecTaskInfoList[i].DetailAddr = GetRegion(ctx, secTask.RegionCode)
|
|
|
|
+ }
|
|
|
|
+ newSecTaskInfoList[i].DetailAddr += secTask.DetailAddr
|
|
}
|
|
}
|
|
var resSecTaskInfoList []*http_model.SecTaskInfo
|
|
var resSecTaskInfoList []*http_model.SecTaskInfo
|
|
if searchValue != "" {
|
|
if searchValue != "" {
|