bug

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -450,12 +451,16 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file);
 
+        if (responseBean.getCode() != 1000){
+            return responseBean;
+        }
         //获取要上传的数据
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
         
         //批量插入
         list.forEach(e -> {
+            // 校验是否存在重复房源
             e.setOrgId(userElement.getOrgId());
             e.setVerifyStatus("0");
             e.setPairStatus("0");
@@ -711,7 +716,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
                     return responseBean;
                 }
-    
+                LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
+                TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(ownerInfoQueryWrapper);
+                if (null != tpBuildingOwnerInfo){
+                    responseBean.addError("第" + currentRow + "行" + "户主已存在!");
+                    return responseBean;
+                }
+
 //                if (temBuildingList.contains(roomNoId)){
 //                    logger.info("存在重复房源:{}",roomNoId);
 //                    responseBean.addError("第"+ currentRow +"行存在重复房源");
@@ -864,13 +877,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
-            buildingOwnerInfoQueryWrapper.eq("ta_user_verify_id", e);
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(buildingOwnerInfoQueryWrapper);
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
             if (null != tpBuildingOwnerInfo) {
                 tpBuildingOwnerInfoMapper.deleteById(tpBuildingOwnerInfo.getId());
             }
-            taUserVerifyMapper.deleteById(e);
+            if (null != tpBuildingOwnerInfo.getTaUserVerifyId()){
+                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getTaUserVerifyId());
+            }
 
             // 作废话题
 //            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -314,12 +314,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         taUserVerify.setLoginName(currentUser.getName());
 
         // 开始查询 业主
-        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-        if (null != userVerify) {
-            TaUser taUser = taUserMapper.selectById(userVerify.getPersonId());
-            taUserVerify.setOwnerName(taUser.getUserName());
-        }
-
+//        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
         responseBean.addSuccess(taUserVerify);
         return responseBean;
     }
@@ -404,7 +399,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
                 tpBuildingOwnerInfo.setCreateUser(-1);
                 tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
-                tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+                tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
 
                 taUserVerify.setVerifyStatus("1");
                 taUserVerify.setVerifyName("自动审核通过");