From 29c3367d8c8f9777bde6a86fa26c86d19a35bc07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 15:18:25 +0800
Subject: [PATCH] Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
index 0eb225b..9a05a2c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngRealCompanyServiceImpl.java
@@ -1,4 +1,5 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -119,13 +120,17 @@
BeanUtils.copyProperties(l, comMngRealCompanyDO);
comMngRealCompanyDO.setCommunityId(communityId);
comMngRealCompanyDOS.add(comMngRealCompanyDO);
+ }else{
+ BeanUtils.copyProperties(l, realCompany);
+ realCompany.setCommunityId(communityId);
+ comMngRealCompanyDOS.add(realCompany);
}
});
- boolean batch = this.saveBatch(comMngRealCompanyDOS);
+ boolean batch = this.saveOrUpdateBatch(comMngRealCompanyDOS);
if (batch) {
return R.ok();
}
- return R.fail("请检查数据是否重复，格合是否正确");
+ return R.fail("请检查格式是否正确");
}
@Override
@@ -140,4 +145,9 @@
return R.ok(comMngRealCompanyBelongsVO);
}
+ @Override
+ public R getComMngRealCompanyTotalByAdmin(Long communityId) {
+ return R.ok(this.baseMapper.getComMngRealCompanyTotalByAdmin(communityId));
+ }
+
}
--
Gitblit v1.7.1