修改bug

huanghongfa

2021-07-28 04ee9afc3f33f48327e360be965f882ffd2c16be

 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());
@@ -348,7 +349,7 @@
                return R.fail("系统预置标签不可修改");
            }
            ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
            if(null!=exist && exist.getId()!=comMngUserTagDO.getId()){
            if(null!=exist && !exist.getId().equals(comMngTagVO.getId())){
                return R.fail("标签重复");
            }
            comMngUserTagDO.setTagName(comMngTagVO.getTagName());