Merge branch 'release4.7.10' of http://192.168.3.207:8080/qmx/jy into release4.7.10

src/jfw/front/shorturl.go

@@ -414,7 +414,7 @@ func CNode(userId string) bool {
 			rM["company"] = util.ObjToString((*userinfo)["s_company"])
 		}
 	}
-	if rM["name"] != nil && rM["name"] != "" && rM["phone"] != nil && rM["phone"] != "" && rM["company"] != nil && rM["company"] != "" && rM["position"] != nil && rM["position"] != "" {
+	if rM["name"] != nil && rM["name"] != "" && rM["phone"] != nil && rM["phone"] != "" && rM["company"] != nil && rM["company"] != "" && rM["position"] != nil && rM["position"] != "" && rM["companyType"] != "" {
 
 		if rM["position"] != "总裁" && rM["position"] != "总经理" && (rM["branch"] == nil || rM["branch"] == "") {
 			return false

src/jfw/modules/app/src/app/front/shorturl.go

@@ -220,7 +220,7 @@ func CNode(userId string) bool {
 			rM["company"] = util.ObjToString((*userinfo)["s_company"])
 		}
 	}
-	if rM["name"] != nil && rM["name"] != "" && rM["phone"] != nil && rM["phone"] != "" && rM["company"] != nil && rM["company"] != "" && rM["position"] != nil && rM["position"] != "" {
+	if rM["name"] != nil && rM["name"] != "" && rM["phone"] != nil && rM["phone"] != "" && rM["company"] != nil && rM["company"] != "" && rM["position"] != nil && rM["position"] != "" && rM["companyType"] != "" {
 
 		if rM["position"] != "总裁" && rM["position"] != "总经理" && (rM["branch"] == nil || rM["branch"] == "") {
 			return false