lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug，建表

Browse Source
This commit is contained in:
lcj
2025-10-10 10:08:23 +08:00
parent 372c825844
commit 502cc55143
5 changed files with 516 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubContractorServiceImpl.java
View File

@ -14,7 +14,6 @@ import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.contractor.domain.SubConstructionUser;
import org.dromara.contractor.domain.SubContractor;
import org.dromara.contractor.domain.dto.contractor.SubContractorCreateReq;
@ -119,7 +118,10 @@ public class SubContractorServiceImpl extends ServiceImpl<SubContractorMapper, S
// 数据校验
validEntityBeforeSave(contractor);
String name = req.getName();
Long count = this.lambdaQuery().eq(SubContractor::getName, name).count();
Long count = this.lambdaQuery()
.eq(SubContractor::getName, name)
.eq(SubContractor::getProjectId, req.getProjectId())
.count();
if (count > 0) {
throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST);
}
@ -160,7 +162,11 @@ public class SubContractorServiceImpl extends ServiceImpl<SubContractorMapper, S
}
// 判断名称是否重复
if (!oldContractor.getName().equals(req.getName())) {
Long count = this.lambdaQuery().eq(SubContractor::getName, req.getName()).count();
Long count = this.lambdaQuery()
.eq(SubContractor::getName, req.getName())
.eq(SubContractor::getProjectId, req.getProjectId())
.ne(SubContractor::getId, contractor.getId())
.count();
if (count > 0) {
throw new ServiceException("分包单位名称重复", HttpStatus.BAD_REQUEST);
}