|
@@ -200,11 +200,14 @@ public class CzrkServiceImpl implements ICzrkService {
|
|
if (isEmpty(czrks)) return;
|
|
if (isEmpty(czrks)) return;
|
|
// 户籍地
|
|
// 户籍地
|
|
String province = nullToEmpty(czrks.getString("province")), city = nullToEmpty(czrks.getString("city")), region = nullToEmpty(czrks.getString("region")), villageTowns = nullToEmpty(czrks.getString("villageTowns")), village = nullToEmpty(czrks.getString("village")), villageGroup = nullToEmpty(czrks.getString("villageGroup")), nowIn = nullToEmpty(czrks.getString("nowIn"));
|
|
String province = nullToEmpty(czrks.getString("province")), city = nullToEmpty(czrks.getString("city")), region = nullToEmpty(czrks.getString("region")), villageTowns = nullToEmpty(czrks.getString("villageTowns")), village = nullToEmpty(czrks.getString("village")), villageGroup = nullToEmpty(czrks.getString("villageGroup")), nowIn = nullToEmpty(czrks.getString("nowIn"));
|
|
- czrks.put("domicileSelect", province + city + region + villageTowns + village + villageGroup + nowIn);
|
|
|
|
|
|
+ province = province + city + region + villageTowns + village + villageGroup + nowIn;
|
|
|
|
+ if (StringUtils.isNotBlank(province)){
|
|
|
|
+ czrks.put("domicileSelect", province);
|
|
|
|
+ }
|
|
|
|
|
|
- // 现居住地
|
|
|
|
|
|
+/* // 现居住地
|
|
String provinceCz = nullToEmpty(czrks.getString("provinceIdXjd")), cityCz = nullToEmpty(czrks.getString("cityIdXjd")), regionCz = nullToEmpty(czrks.getString("regionXjd")), villageTownsCz = nullToEmpty(czrks.getString("villageTownsXjd")), villageCz = nullToEmpty(czrks.getString("villageXjd")), nowInCz = nullToEmpty(czrks.getString("nowIn"));
|
|
String provinceCz = nullToEmpty(czrks.getString("provinceIdXjd")), cityCz = nullToEmpty(czrks.getString("cityIdXjd")), regionCz = nullToEmpty(czrks.getString("regionXjd")), villageTownsCz = nullToEmpty(czrks.getString("villageTownsXjd")), villageCz = nullToEmpty(czrks.getString("villageXjd")), nowInCz = nullToEmpty(czrks.getString("nowIn"));
|
|
- czrks.put("nowInSelect",provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);
|
|
|
|
|
|
+ czrks.put("nowInSelect",provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);*/
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|