From 69e9f770df9d32067237f08572c038e71d23ea33 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@simba>
Date: Thu, 2 Jan 2020 18:12:14 +0800
Subject: [PATCH] update

---
 obj.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/obj.go b/obj.go
index 4bb9c1b..f80c735 100644
--- a/obj.go
+++ b/obj.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"log"
@@ -65,18 +66,18 @@ func loadObjType() error {
 	cacheObjType = make(map[string]int64)
 
 	for _, v := range obj {
-		id := codeObjTypeId(v.IntlId)
-		if id > 0 {
+		id, err := codeObjTypeId(v.IntlId)
+		if err == nil {
 			cacheObjType[v.IntlId] = id
 		} else {
 			err = insertObjType(v.IntlId, v.Name)
 			logOnError(err, "loadObjType : insertObjType")
 			if err == nil {
-				id = codeObjTypeId(v.IntlId)
-				if id > 0 {
+				id, err = codeObjTypeId(v.IntlId)
+				if err == nil {
 					cacheObjType[v.IntlId] = id
 				} else {
-					// issue inserting
+					logOnError(err, "loadObjType : codeObjTypeId")
 				}
 			}
 		}
@@ -103,18 +104,18 @@ func loadObjSubType() error {
 	cacheObjSubType = make(map[string]int64)
 
 	for _, v := range obj {
-		id := codeObjSubTypeId(v.IntlId)
-		if id > 0 {
+		id, err := codeObjSubTypeId(v.IntlId)
+		if err == nil {
 			cacheObjSubType[v.IntlId] = id
 		} else {
 			err = insertObjSubType(v.IntlId, v.Name, v.ObjType)
 			logOnError(err, "loadObjSubType : insertObjSubType")
 			if err == nil {
-				id = codeObjSubTypeId(v.IntlId)
-				if id > 0 {
+				id, err = codeObjSubTypeId(v.IntlId)
+				if err == nil {
 					cacheObjSubType[v.IntlId] = id
 				} else {
-					// issue inserting
+					logOnError(err, "loadObjSubType : codeObjSubTypeId")
 				}
 			}
 		}