fix 修改了户籍地址和详细地址列表展示双行显示,修改了认领后没有给deptId赋值

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

@@ -149,7 +149,7 @@ public class CzrkServiceImpl implements ICzrkService {
             if(czrks != null && czrks.size() > 0){
                 for (Czrk crk : czrks) {
                     String provinceCz = nullToEmpty(crk.getProvince()), cityCz = nullToEmpty(crk.getCity()), regionCz = nullToEmpty(crk.getRegion()), villageTownsCz = nullToEmpty(crk.getVillageTowns()), villageCz = nullToEmpty(crk.getVillage()),  nowInCz = nullToEmpty(crk.getNowIn());
-                    crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);
+                    crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz);
                 }
             }
 /*            List<CzrkJzdz> czrkJzdzs = czrkJzdzService.selectCzrkJzdzList(czrkJzdz);
@@ -230,14 +230,14 @@ public class CzrkServiceImpl implements ICzrkService {
 //            if (Czrk.HJ.equals(queryType)) {
             // 户籍地
             String province = nullToEmpty(crk.getProvince()), city = nullToEmpty(crk.getCity()), region = nullToEmpty(crk.getRegion()), villageTowns = nullToEmpty(crk.getVillageTowns()), village = nullToEmpty(crk.getVillage()), villageGroup = nullToEmpty(crk.getVillagerGroup()), nowIn = nullToEmpty(crk.getNowIn());
-            crk.setDomicileSelect(province + city + region + villageTowns + village + villageGroup + nowIn);
+            crk.setDomicileSelect(province + city + region + villageTowns + village + villageGroup);
 
             // 现居住地
             for (CzrkJzdz czrkJzdz : czrkJzdzList) {
                 if (!czrkJzdz.getIdCard().equals(crk.getIdCard())) continue;
 
                 String provinceCz = nullToEmpty(czrkJzdz.getProvince()), cityCz = nullToEmpty(czrkJzdz.getCity()), regionCz = nullToEmpty(czrkJzdz.getRegion()), villageTownsCz = nullToEmpty(czrkJzdz.getTown()), villageCz = nullToEmpty(czrkJzdz.getVillage()), nowInCz = nullToEmpty(czrkJzdz.getNowIn());
-                crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);
+                crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz);
                 break;
             }
 //            }
@@ -249,11 +249,11 @@ public class CzrkServiceImpl implements ICzrkService {
         for (Czrk crk : czrks) {
             // 户籍地
             String province = nullToEmpty(crk.getProvince()), city = nullToEmpty(crk.getCity()), region = nullToEmpty(crk.getRegion()), villageTowns = nullToEmpty(crk.getVillageTowns()), village = nullToEmpty(crk.getVillage()), villageGroup = nullToEmpty(crk.getVillagerGroup()), nowIn = nullToEmpty(crk.getNowIn());
-            crk.setDomicileSelect(province + city + region + villageTowns + village + villageGroup + nowIn);
+            crk.setDomicileSelect(province + city + region + villageTowns + village + villageGroup);
 
             // 现居住地
             String provinceCz = nullToEmpty(crk.getProvinceXjd()), cityCz = nullToEmpty(crk.getCityXjd()), regionCz = nullToEmpty(crk.getRegionXjd()), villageTownsCz = nullToEmpty(crk.getVillageTownsXjd()), villageCz = nullToEmpty(crk.getVillageXjd()), nowInCz = nullToEmpty(crk.getDomicile());
-            crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz + nowInCz);
+            crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz);
         }
     }
 
@@ -261,7 +261,7 @@ 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"));
-        province = province + city + region + villageTowns + village + villageGroup + nowIn;
+        province = province + city + region + villageTowns + village + villageGroup;
         if (StringUtils.isNotBlank(province)) {
             czrks.put("domicileSelect", province);
         }
@@ -277,7 +277,7 @@ public class CzrkServiceImpl implements ICzrkService {
         for (CzrkJzdz czrkJzdz : czrkJzdzList) {
             // 户籍地
             String province = nullToEmpty(czrkJzdz.getProvince()), city = nullToEmpty(czrkJzdz.getCity()), region = nullToEmpty(czrkJzdz.getRegion()), villageTowns = nullToEmpty(czrkJzdz.getTown()), village = nullToEmpty(czrkJzdz.getVillage()), nowIn = nullToEmpty(czrkJzdz.getNowIn());
-            czrkJzdz.setNowIn(province + city + region + villageTowns + village + nowIn);
+            czrkJzdz.setNowIn(province + city + region + villageTowns + village);
         }
     }
 
@@ -629,6 +629,7 @@ public class CzrkServiceImpl implements ICzrkService {
             }
         }
         LoginUser loginUser = tokenService.getLoginUser();
+
         // 获取当前的用户账号
         String username = loginUser.getUsername();
         //用户姓名
@@ -639,6 +640,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 czrk.setRlrNike(nickName);
                 czrk.setRlr(username);
                 czrk.setIsRl("是");
+                czrk.setDeptId(loginUser.getSysUser().getDeptId());
                 czrk.setRlTime(new Date(System.currentTimeMillis()));
             } else {
                 czrk.setIsRl("否");
@@ -748,7 +750,7 @@ public class CzrkServiceImpl implements ICzrkService {
                 return jsonObject;
             }
 
-            ThreadPoolService.execute(() -> {
+            /*ThreadPoolService.execute(() -> {
                 System.out.println("我进来了");
                 //Long areaId = 340882000000L;
                 //todo 固定写了潜山市
@@ -831,16 +833,16 @@ public class CzrkServiceImpl implements ICzrkService {
                 System.out.println("我出去了");
             });
 
-            return QIANSHANSHI_SINGEL;
+            return QIANSHANSHI_SINGEL;*/
         } else if (roleKeySets.contains("sys:town")) {
             JSONObject jsonObject = redisService.getCacheObject(packRedisKey("town:" + deptId));
             if (isNotEmpty(jsonObject)) {
                 return jsonObject;
             }
 
-            townSts(result, deptId, sysUser.getDept().getDeptName(), true);
+            //townSts(result, deptId, sysUser.getDept().getDeptName(), true);
 //            redisService.setCacheObject(packRedisKey("town:" + deptId), result, 1L, TimeUnit.DAYS);
-            setIntoRedis(packRedisKey("town:" + deptId), result);
+            //setIntoRedis(packRedisKey("town:" + deptId), result);
         }
 
         System.out.println("我最后出去了");

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

@@ -756,6 +756,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         set is_del        = 'N'
           , update_by     = #{updateBy}
           , update_time   = sysdate()
+          ,delete_reason = ''
         where id = #{id}
     </update>