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/ComActFourMemberServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index 86a2814..b1fa119 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
@@ -78,6 +78,11 @@
@Override
public R insert(ComActFourMemberVO comActFourMemberVO) {
if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
+ if(comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda()
+ .eq(ComActFourMember::getIdCard,comActFourMemberVO.getIdCard())
+ .eq(ComActFourMember::getCommunityId, comActFourMemberVO.getCommunityId()))>0){
+ return R.fail("身份证号重复");
+ }
ComActFourMember comActFourMember=new ComActFourMember();
List<String> jurisdictionList=new ArrayList<>();
List<String> jurisdictionList1=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
@@ -191,7 +196,7 @@
}
@Override
- public R get(Integer id) {
+ public R get(Long id) {
return R.ok(comActFourMemberDao.getById(id));
}
--
Gitblit v1.7.1