From 458a590d905246081332cba18997c9b5c68aa725 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 10 五月 2021 15:55:07 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
index c10d2e9..c46f91e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
@@ -91,12 +91,13 @@
if(count==0){
SysUserInputDO sysUserInputDO=new SysUserInputDO();
String doorNumber = eexcelUserDTO.getDoorNumber();
- List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
- if (ObjectUtils.isEmpty(collect)) {
- throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
- }else{
- sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
- }
+ //暂时注释门牌号匹配设置房屋编号功能
+// List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
+// if (ObjectUtils.isEmpty(collect)) {
+// throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
+// }else{
+// sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
+// }
sysUserInputDO.setAreaId(comMngStructAreaVO.getId());
sysUserInputDO.setCommunityId(comMngStructAreaVO.getCommunityId());
sysUserInputDO.setCompany(eexcelUserDTO.getCompany());
@@ -226,7 +227,7 @@
SysUserInputDO userInputDO=new SysUserInputDO();
userInputDO.setId(inputUserTagsDTO.getId());
userInputDO.setTags(inputUserTagsDTO.getTags());
- List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard,userInputDO.getIdCard()));
+ List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getId,userInputDO.getId()));
all.forEach(d->{
if(!StringUtils.isEmpty(d.getTags())){
d.setTags(d.getTags()+","+inputUserTagsDTO.getTags());
--
Gitblit v1.7.1