|
|
@@ -832,15 +832,17 @@ func (d *PlatFollowupDao) checkColumnsName(dataScope map[string]interface{}, arg
|
|
|
delete(dataScope, "roles")
|
|
|
delete(dataScope, "posts")
|
|
|
delete(dataScope, bigColumns)
|
|
|
- for k, v := range dataScope {
|
|
|
- if data, ok := colsContrast[k]; ok {
|
|
|
- dataScope[data.(string)] = v
|
|
|
+ if len(colsContrast) > 0 {
|
|
|
+ for k, v := range dataScope {
|
|
|
+ if data, ok := colsContrast[k]; ok {
|
|
|
+ dataScope[data.(string)] = v
|
|
|
+ }
|
|
|
+ delete(dataScope, k)
|
|
|
+ delete(colsContrast, k)
|
|
|
+ }
|
|
|
+ for k, v := range colsContrast {
|
|
|
+ dataScope[k] = v
|
|
|
}
|
|
|
- delete(dataScope, k)
|
|
|
- delete(colsContrast, k)
|
|
|
- }
|
|
|
- for k, v := range colsContrast {
|
|
|
- dataScope[k] = v
|
|
|
}
|
|
|
return specialFlag, userCols, orColsMap
|
|
|
}
|