From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
index fc3e740..8cf20eb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngCarServiceImpl.java
@@ -190,16 +190,18 @@
list.forEach(vo -> {
int count = comMngCarDAO.selectCount(new QueryWrapper<ComMngCarDO>().lambda()
.eq(ComMngCarDO::getPlateNum, vo.getPlateNum()).and(wrapper -> wrapper.eq(ComMngCarDO::getSource, 2)));
- if (count == 0 && areaMap.containsKey(vo.getAreaName())) {
- ComMngCarDO comMngCarDO = new ComMngCarDO();
- BeanUtils.copyProperties(vo, comMngCarDO);
+ ComMngCarDO comMngCarDO = new ComMngCarDO();
+ BeanUtils.copyProperties(vo, comMngCarDO);
+ if (count == 0 ) {
+ if(StringUtils.isNotEmpty(vo.getAreaName())&&areaMap.containsKey(vo.getAreaName())){
+ comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getVillageId());
+ }
try {
comMngCarDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey));
} catch (Exception e) {
}
comMngCarDO.setCommunityId(communityId);
- comMngCarDO.setAreaId(areaMap.get(vo.getAreaName()).getVillageId());
R<SysUserVO> sysUserVOR = userService.getSysUserVOByPhone(vo.getMobile());
if (R.isOk(sysUserVOR)) {
SysUserVO sysUserVO =
--
Gitblit v1.7.1