Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsDataex/MyService/DataEX/DataexService/BaseGOProc.go

@@ -8,6 +8,8 @@ import (
 	"dsDataex/Utils/CacheUtil"
 	"dsDataex/Utils/ConfigUtil"
 	"encoding/json"
+	"strconv"
+	"strings"
 )
 
 func OrgtreeProc(datas []MySwagger.Data) {
@@ -20,11 +22,10 @@ func OrgtreeProc( datas []MySwagger.Data){
 
 		var data models.TDataexOrgtree
 
-		data.Id=jsonData["org_id"].(string)
+		data.Id = strings.ToLower(jsonData["org_id"].(string))
 		data.OrgName = jsonData["org_name"].(string)
 
-
-		data.OrgType=int(jsonData["org_type"].(float64))
+		data.OrgType, _ = strconv.Atoi(jsonData["org_type"].(string))
 
 		switch data.OrgType {
 		case 1: