test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wenyann 2020-06-02 17:17:21 +08:00
parent 0639330f83 a12cf46b7a
commit e4cdbc8d24
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/io/metersphere/service/OrganizationService.java
View File

@ -71,25 +71,17 @@ public class OrganizationService {
MSException.throwException(Translator.get("organization_name_is_null"));
}
String id = organization.getId();
String name = organization.getName();
if (StringUtils.isNotBlank(id)) {
Organization org = organizationMapper.selectByPrimaryKey(id);
if (!StringUtils.equals(org.getName(), name)) {
checkOrgNameRepeat(name);
}
} else {
checkOrgNameRepeat(name);
}
OrganizationExample example = new OrganizationExample();
OrganizationExample.Criteria criteria = example.createCriteria();
criteria.andNameEqualTo(organization.getName());
if (StringUtils.isNotBlank(organization.getId())) {
criteria.andIdNotEqualTo(organization.getId());
}
public void checkOrgNameRepeat(String orgName) {
OrganizationExample organizationExample = new OrganizationExample();
organizationExample.createCriteria().andNameEqualTo(orgName);
if (organizationMapper.countByExample(organizationExample) > 0) {
if (organizationMapper.countByExample(example) > 0) {
MSException.throwException(Translator.get("organization_name_already_exists"));
}
}
public void deleteOrganization(String organizationId) {