From 9e079353f6510308cdc0a0229179ccadf5d6bcc4 Mon Sep 17 00:00:00 2001
From: wubin <kgdxpr@163.com>
Date: Wed, 15 Jul 2020 16:25:04 +0800
Subject: [PATCH] update

---
 .../DataEX/DataexService/BaseGOProc.go        | 75 ++++++++++---------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go b/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go
index b11b103f..8cc23ee8 100644
--- a/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go
+++ b/dsDataex/MyService/DataEX/DataexService/BaseGOProc.go
@@ -8,11 +8,13 @@ import (
 	"dsDataex/Utils/CacheUtil"
 	"dsDataex/Utils/ConfigUtil"
 	"encoding/json"
+	"strconv"
+	"strings"
 )
 
-func OrgtreeProc( datas []MySwagger.Data){
+func OrgtreeProc(datas []MySwagger.Data) {
 
-	for no:=0;no< len(datas) && no<1000 ;no++ {
+	for no := 0; no < len(datas) && no < 1000; no++ {
 
 		var jsonData map[string]interface{}
 
@@ -20,44 +22,43 @@ func OrgtreeProc( datas []MySwagger.Data){
 
 		var data models.TDataexOrgtree
 
-		data.Id=jsonData["org_id"].(string)
-		data.OrgName=jsonData["org_name"].(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:
-			if ConfigUtil.ROOT_ORGNAME==jsonData["org_name"].(string){
-				data.ParentId="-1"
-			}else {
+			if ConfigUtil.ROOT_ORGNAME == jsonData["org_name"].(string) {
+				data.ParentId = "-1"
+			} else {
 				var areaCode string
 
-				if jsonData["area_code"].(string)[4:]!="00"{
-					areaCode=jsonData["area_code"].(string)[0:4]+"00"
-				}else {
-					areaCode=jsonData["area_code"].(string)[0:2]+"0000"
+				if jsonData["area_code"].(string)[4:] != "00" {
+					areaCode = jsonData["area_code"].(string)[0:4] + "00"
+				} else {
+					areaCode = jsonData["area_code"].(string)[0:2] + "0000"
 				}
 
-				data.ParentId=DataexDAO.GetParentIDBaseGO(areaCode)
+				data.ParentId = DataexDAO.GetParentIDBaseGO(areaCode)
 			}
 
 			break
 		case 2:
-			if ConfigUtil.ROOT_ORGNAME==jsonData["org_name"].(string){
-				data.ParentId="-1"
-			}else {
-				data.ParentId=DataexDAO.GetParentIDBaseGO(jsonData["area_code"].(string))
+			if ConfigUtil.ROOT_ORGNAME == jsonData["org_name"].(string) {
+				data.ParentId = "-1"
+			} else {
+				data.ParentId = DataexDAO.GetParentIDBaseGO(jsonData["area_code"].(string))
 			}
 
-			data.SchoolType=jsonData["xxbxlxm"].(string)
+			data.SchoolType = jsonData["xxbxlxm"].(string)
 
 			break
 		case 7:
-			if ConfigUtil.ROOT_ORGNAME==jsonData["org_name"].(string){
-				data.ParentId="-1"
-			}else {
-				data.ParentId=DataexDAO.GetParentIDBaseGO(jsonData["area_code"].(string))
+			if ConfigUtil.ROOT_ORGNAME == jsonData["org_name"].(string) {
+				data.ParentId = "-1"
+			} else {
+				data.ParentId = DataexDAO.GetParentIDBaseGO(jsonData["area_code"].(string))
 			}
 
 			break
@@ -65,29 +66,29 @@ func OrgtreeProc( datas []MySwagger.Data){
 			return
 		}
 
-		data.ProvinceId=jsonData["province_code"].(string)
+		data.ProvinceId = jsonData["province_code"].(string)
 
-		if jsonData["city_code"].(string)=="" || jsonData["city_code"].(string)=="-1"{
-			data.CityId=jsonData["province_code"].(string)
-		}else {
-			data.CityId=jsonData["city_code"].(string)
+		if jsonData["city_code"].(string) == "" || jsonData["city_code"].(string) == "-1" {
+			data.CityId = jsonData["province_code"].(string)
+		} else {
+			data.CityId = jsonData["city_code"].(string)
 		}
 
-		if jsonData["district_code"].(string)=="" || jsonData["district_code"].(string)=="-1"{
-			data.AreaId=data.CityId
-		}else {
-			data.AreaId=jsonData["district_code"].(string)
+		if jsonData["district_code"].(string) == "" || jsonData["district_code"].(string) == "-1" {
+			data.AreaId = data.CityId
+		} else {
+			data.AreaId = jsonData["district_code"].(string)
 		}
 
 		data.DeleteFlag = -1
 		data.EnableFlag = 1
 
-		ids:=[]string{datas[no].DataID}
-		result := CacheUtil.GetListByIds( ids ,CacheUtil.GetBean("t_dataex_orgtree"))
+		ids := []string{datas[no].DataID}
+		result := CacheUtil.GetListByIds(ids, CacheUtil.GetBean("t_dataex_orgtree"))
 
-		if len(result)==1{
-			OrgtreeDAO.UpdateOrgtree(data.Id,&data)
-		}else {
+		if len(result) == 1 {
+			OrgtreeDAO.UpdateOrgtree(data.Id, &data)
+		} else {
 			OrgtreeDAO.CreateOrgtree(&data)
 		}
 	}