From 998c163dec6e53c279c7be9607baa14c0fdebd0e Mon Sep 17 00:00:00 2001
From: zhouyahui <zhouyh@tenwa.com.cn>
Date: Tue, 25 Jun 2019 10:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E4=B8=8D=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicleAssessmentController.java          | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
index 32f454753..e7f35d935 100644
--- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
+++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java
@@ -52,29 +52,39 @@ public class vehicleAssessmentController {
 									String area = boLSNT.getAttribute("zone").getString();
 									if(area.indexOf("上海") != -1){
 											area = "上海上海市";
-									}else if(area.indexOf("重庆") != -1){
+									}
+									if(area.indexOf("重庆") != -1){
 											area = "重庆重庆市";
-									}else if(area.indexOf("北京") != -1){
+									}
+									if(area.indexOf("北京") != -1){
 										    area = "北京北京市";
-									}else if(area.indexOf("天津") != -1){
+									}
+									if(area.indexOf("天津") != -1){
 											//area = "天津市市辖区";
 											area = "天津天津市";
-									}else if(area.indexOf("地区") != -1){
+									}
+									if(area.indexOf("地区") != -1){
 											area = area.substring(0,area.indexOf("地区")+2);
-									}else if(area.indexOf("市") != -1){
+									}
+									if(area.indexOf("市") != -1){
 											area = area.substring(0,area.indexOf("市")+1);
-									}else if(area.indexOf("区") != -1){
+									}
+									if(area.indexOf("区") != -1){
 											area = area.substring(0,area.indexOf("区")+1);
-									}else if(area.indexOf("自治州") != -1){
+									}
+									if(area.indexOf("自治州") != -1){
 											area = area.substring(0,area.indexOf("自治州")+3);
-									}else if(area.indexOf("自治县") != -1){
+									}
+									if(area.indexOf("自治县") != -1){
 											area = area.substring(0,area.indexOf("自治县")+3);
-									}else if(area.indexOf("县") != -1){
+									}
+									if(area.indexOf("县") != -1){
 											area = area.substring(0,area.indexOf("县")+1);
-									}else if(area.indexOf("盟") != -1){
+									}
+									if(area.indexOf("盟") != -1){
 										area = area.substring(0,area.indexOf("盟")+1);
 									}
-									else{
+									if(area ==null ||"".equals(area)){
 											return "请返回租赁车辆基本信息页面填写地区!";
 									}									
 									//到数据字典中查询对应的行政编号作为接口入参的zone参数