浏览代码

fix 处理对外接口

tjf 3 年之前
父节点
当前提交
76ba10b1cd

+ 6 - 3
boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -200,11 +200,14 @@ public class CzrkServiceImpl implements ICzrkService {
         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"));
-        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"));
-        czrks.put("nowInSelect",provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);
+        czrks.put("nowInSelect",provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);*/
 
     }
 

+ 1 - 1
boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -545,7 +545,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where house_type = '是' and code = #{code} limit 1;
     </select>
 
-    <select id="getColumnNamesByIdCard" resultType="object">
+    <select id="getColumnNamesByIdCard" resultType="com.alibaba.fastjson.JSONObject">
         SELECT id, ${columnNames}
         from czrk
         where id_card = #{idCard} limit 1;