From 0ce15190cdc3aa3654dd6ad67afaa1adba631851 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期二, 05 十二月 2023 10:14:35 +0800 Subject: [PATCH] #劳务人员禁启用 --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java index 1009c4a..5958cf0 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.Objects; /** * 浼佷笟淇℃伅琛⊿ervice瀹炵幇 @@ -255,9 +256,16 @@ .eq(Company::getType,Constants.ZERO) .eq(Company::getName,company.getName()); List<Company> companies = companyMapper.selectList(wrapper); - - if (CollectionUtils.isNotEmpty(companies)){ - throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"浼佷笟淇℃伅宸插瓨鍦�"); + if (CollectionUtils.isEmpty(companies)){ + return; + } + //鏂板鐨勬儏鍐靛瓨鍦ㄨ褰� + if (Objects.isNull(company.getId())){ + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍏徃鍚嶇О宸插瓨鍦�"); + } + //淇敼鐨勬儏鍐靛瓨鍦ㄨ褰� 鍖归厤涓嶅埌 own + if (!companies.stream().map(s -> s.getId()).anyMatch(s -> s.equals(company.getId()))){ + throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍏徃鍚嶇О宸插瓨鍦�"); } } } -- Gitblit v1.9.3