|
|
@@ -293,10 +293,12 @@ func IntAllDef(num interface{}, defaultNum int) int {
|
|
|
func ObjToString(old interface{}) string {
|
|
|
if nil == old {
|
|
|
return ""
|
|
|
- } else {
|
|
|
- r, _ := old.(string)
|
|
|
- return r
|
|
|
+ } else if r1, ok1 := old.(string); ok1 {
|
|
|
+ return r1
|
|
|
+ } else if r2, ok2 := old.(*string); ok2 {
|
|
|
+ return *r2
|
|
|
}
|
|
|
+ return ""
|
|
|
}
|
|
|
|
|
|
func ObjToStringDef(old interface{}, defaultstr string) string {
|
