From a777cbf23ac54f9e2c24bdbad102d45deb0b06b1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 29 九月 2021 17:48:03 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
index 950f63f..86d1491 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComClusterOrganizationMemberServiceImpl.java
@@ -81,9 +81,9 @@
BeanUtils.copyProperties(addClusterMemberAdminDto,organizationMemberDO);
organizationMemberDO.setCreateAt(new Date());
if(this.baseMapper.insert(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("添加成功");
}
- return R.fail();
+ return R.fail("添加失败");
}
/**
@@ -109,9 +109,9 @@
BeanUtils.copyProperties(editClusterMemberAdminDto,organizationMemberDO);
organizationMemberDO.setUpdateAt(new Date());
if(this.baseMapper.updateById(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("编辑成功");
}
- return R.fail();
+ return R.fail("编辑失败");
}
/**
@@ -126,9 +126,9 @@
organizationMemberDO.setIsDel(ComClusterOrganizationMemberDO.isOk.yes);
organizationMemberDO.setUpdateAt(new Date());
if(this.baseMapper.updateById(organizationMemberDO) > 0){
- return R.ok();
+ return R.ok("删除成功");
}
- return R.fail();
+ return R.fail("删除失败");
}
/**
@@ -211,7 +211,7 @@
}
//判断组织是否存在
- if(!isOnly(memberExcel.getClusterName(),clusterMap)){
+ if(isOnly(memberExcel.getClusterName(),clusterMap)){
ComClusterMemberExcelErrorVO memberExcelErrorVO = new ComClusterMemberExcelErrorVO();
BeanUtils.copyProperties(memberExcel,memberExcelErrorVO);
memberExcelErrorVO.setError("该组织在本社区不存在");
--
Gitblit v1.7.1